summaryrefslogtreecommitdiff
path: root/includes/general.php
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@cacert.org>2014-03-19 12:04:35 +0100
committerBenny Baumann <BenBE@cacert.org>2014-03-19 12:04:35 +0100
commitea9f9d8d7f0b8f196161333384da2b814ac973fe (patch)
treed0521b2adc107865ad9a9f7f3ac1a2cf4bd46e21 /includes/general.php
parent8568089afac180c1f3ff323a8775f974071a5cda (diff)
downloadcacert-devel-ea9f9d8d7f0b8f196161333384da2b814ac973fe.tar.gz
cacert-devel-ea9f9d8d7f0b8f196161333384da2b814ac973fe.tar.xz
cacert-devel-ea9f9d8d7f0b8f196161333384da2b814ac973fe.zip
bug 1184: Quick workaround for name collission on hex2bin on recent PHP versionsbug-1184
Diffstat (limited to 'includes/general.php')
-rw-r--r--includes/general.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/general.php b/includes/general.php
index d89c0e6..95ed64a 100644
--- a/includes/general.php
+++ b/includes/general.php
@@ -506,7 +506,7 @@
return(0);
}
- function hex2bin($data)
+ function gpg_hex2bin($data)
{
while(strstr($data, "\\x"))
{