SF.net SVN: postfixadmin:[1329] branches/postfixadmin-2.3

[<chr...@us...>]

Revision: 1329
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1329&view=rev
Author:   christian_boltz
Date:     2012-01-11 18:45:10 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
functions.inc.php:
- PHP around 5.3.8 includes hex2bin as native function - http://php.net/hex2bin
  therefore we have to wrap our function (which fortunately gives the same
  results) with function_exists().
  Reported by MadOtis on #postfixadmin

Modified Paths:
--------------
    branches/postfixadmin-2.3/CHANGELOG.TXT
    branches/postfixadmin-2.3/functions.inc.php

Modified: branches/postfixadmin-2.3/CHANGELOG.TXT
===================================================================
--- branches/postfixadmin-2.3/CHANGELOG.TXT	2012-01-11 18:40:58 UTC (rev 1328)
+++ branches/postfixadmin-2.3/CHANGELOG.TXT	2012-01-11 18:45:10 UTC (rev 1329)
@@ -24,6 +24,7 @@
   - create-domain: fix SQL injection (only exploitable by superadmins)
   - add missing $LANG['pAdminDelete_admin_error']
   - don't mark mailbox targets with recipient delimiter as "forward only"
+  - wrap hex2bin with function_exists() - PHP 5.3.8 has it as native function
 
 Version 2.3.4 - 2011/09/16 - SVN r1180 (postfixadmin-2.3 branch)
 ----------------------------------------------------------------

Modified: branches/postfixadmin-2.3/functions.inc.php
===================================================================
--- branches/postfixadmin-2.3/functions.inc.php	2012-01-11 18:40:58 UTC (rev 1328)
+++ branches/postfixadmin-2.3/functions.inc.php	2012-01-11 18:45:10 UTC (rev 1329)
@@ -1356,6 +1356,7 @@
     return $salt;
 }
 
+/**/ if (!function_exists('hex2bin')) { # PHP around 5.3.8 includes hex2bin as native function - http://php.net/hex2bin
 function hex2bin ($str)
 {
     $len = strlen ($str);
@@ -1367,6 +1368,7 @@
     }
     return $nstr;
 }
+/**/ }
 
 function to64 ($v, $n)
 {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.