Don't clobber php54's hex2bin(). This resolves a compatability issue
between squirrelmail and php54, though others remain. This patch was adapted from the squirrelmail SVN repo.
This commit is contained in:
parent
e58ca03ab3
commit
823896d5e8
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=303979
1 changed files with 33 additions and 0 deletions
|
@ -0,0 +1,33 @@
|
|||
--- plugins/mail_fetch/functions.php.old 2012-09-08 17:58:39.000000000 -0400
|
||||
+++ plugins/mail_fetch/functions.php 2012-09-08 18:01:06.000000000 -0400
|
||||
@@ -92,15 +92,22 @@
|
||||
return '';
|
||||
}
|
||||
|
||||
-function hex2bin( $data ) {
|
||||
- /* Original code by josh@superfork.com */
|
||||
+/**
|
||||
+ * hex2bin - convert a hexadecimal string into binary
|
||||
+ * Part of php54, so don't try to clobber it
|
||||
+ */
|
||||
+if ( ! function_exists('hex2bin') ) {
|
||||
+ function hex2bin( $data ) {
|
||||
|
||||
- $len = strlen($data);
|
||||
- $newdata = '';
|
||||
- for( $i=0; $i < $len; $i += 2 ) {
|
||||
- $newdata .= pack( "C", hexdec( substr( $data, $i, 2) ) );
|
||||
- }
|
||||
- return $newdata;
|
||||
+ /* Original code by josh@superfork.com */
|
||||
+
|
||||
+ $len = strlen($data);
|
||||
+ $newdata = '';
|
||||
+ for( $i=0; $i < $len; $i += 2 ) {
|
||||
+ $newdata .= pack( "C", hexdec( substr( $data, $i, 2) ) );
|
||||
+ }
|
||||
+ return $newdata;
|
||||
+ }
|
||||
}
|
||||
|
||||
function mf_keyED( $txt ) {
|
Loading…
Reference in a new issue