diff --git a/ChangeLog b/ChangeLog index c45470f64..c917795fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA thanks to abignale - abignale - bug #2787162 [interface] Table with name 'log_views' is incorrectly displayed as a view - bug #2784400 [parser] INVOKER not understood by parser +- [core] Compatibility with PHP 5.3.0RC2 3.1.4.0 (2009-04-25) + patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ, diff --git a/libraries/common.inc.php b/libraries/common.inc.php index dbcd99d9c..1ebbb88d0 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -240,9 +240,7 @@ if (isset($_POST['usesubform'])) { // end check if a subform is submitted // remove quotes added by php -// (get_magic_quotes_gpc() is deprecated in PHP 5.3, but compare with 5.2.99 -// to be able to test with 5.3.0-dev) -if (function_exists('get_magic_quotes_gpc') && -1 == version_compare(PHP_VERSION, '5.2.99') && get_magic_quotes_gpc()) { +if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { PMA_arrayWalkRecursive($_GET, 'stripslashes', true); PMA_arrayWalkRecursive($_POST, 'stripslashes', true); PMA_arrayWalkRecursive($_COOKIE, 'stripslashes', true);