summaryrefslogtreecommitdiff
path: root/includes/general.php
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2014-05-01 00:17:08 +0200
committerBenny Baumann <BenBE@geshi.org>2014-05-01 00:17:08 +0200
commita11cfcccaad26310d539c9dd70857d1eae72badd (patch)
tree73f3c8f268f69fc091e5b02d9aebba18cad00948 /includes/general.php
parent7e6053f91c8be4f2b2d1a6a3e93c62fbf8f8c156 (diff)
parent24d8235f875f9ecff3198e3f0cf8d450beae1989 (diff)
downloadcacert-devel-a11cfcccaad26310d539c9dd70857d1eae72badd.tar.gz
cacert-devel-a11cfcccaad26310d539c9dd70857d1eae72badd.tar.xz
cacert-devel-a11cfcccaad26310d539c9dd70857d1eae72badd.zip
Merge branch 'release' into bug-1138
Diffstat (limited to 'includes/general.php')
-rw-r--r--includes/general.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/general.php b/includes/general.php
index 9eb5060..854aab4 100644
--- a/includes/general.php
+++ b/includes/general.php
@@ -219,7 +219,7 @@
//echo "Points due to name matches: $points<br/>";
$shellpwd = escapeshellarg($pwd);
- $do = `grep $shellpwd /usr/share/dict/american-english`;
+ $do = `grep -F -- $shellpwd /usr/share/dict/american-english`;
if($do)
$points--;
@@ -506,7 +506,7 @@
return(0);
}
- function hex2bin($data)
+ function gpg_hex2bin($data)
{
while(strstr($data, "\\x"))
{