[core] Compatibility with PHP 5.3.0RC2

This commit is contained in:
Marc Delisle
2009-05-08 14:15:55 +00:00
parent 9df074aad3
commit c7e897b1e5
2 changed files with 2 additions and 3 deletions

View File

@@ -73,6 +73,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
thanks to abignale - abignale thanks to abignale - abignale
- bug #2787162 [interface] Table with name 'log_views' is incorrectly displayed as a view - bug #2787162 [interface] Table with name 'log_views' is incorrectly displayed as a view
- bug #2784400 [parser] INVOKER not understood by parser - bug #2784400 [parser] INVOKER not understood by parser
- [core] Compatibility with PHP 5.3.0RC2
3.1.4.0 (2009-04-25) 3.1.4.0 (2009-04-25)
+ patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ, + patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ,

View File

@@ -240,9 +240,7 @@ if (isset($_POST['usesubform'])) {
// end check if a subform is submitted // end check if a subform is submitted
// remove quotes added by php // remove quotes added by php
// (get_magic_quotes_gpc() is deprecated in PHP 5.3, but compare with 5.2.99 if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
// 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()) {
PMA_arrayWalkRecursive($_GET, 'stripslashes', true); PMA_arrayWalkRecursive($_GET, 'stripslashes', true);
PMA_arrayWalkRecursive($_POST, 'stripslashes', true); PMA_arrayWalkRecursive($_POST, 'stripslashes', true);
PMA_arrayWalkRecursive($_COOKIE, 'stripslashes', true); PMA_arrayWalkRecursive($_COOKIE, 'stripslashes', true);