From 87e6dd4689410985a2300792dad09e4b6422335d Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 29 Mar 2008 11:16:04 +0000 Subject: [PATCH] enable testing under PHP 5.3.0-dev --- libraries/common.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 88e11fd9c..f602897f2 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -226,8 +226,9 @@ if (isset($_POST['usesubform'])) { // end check if a subform is submitted // remove quotes added by php -// (@ before get_magic_quotes_gpc() because it's deprecated in PHP 5.3) -if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc()) { +// (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()) { PMA_arrayWalkRecursive($_GET, 'stripslashes', true); PMA_arrayWalkRecursive($_POST, 'stripslashes', true); PMA_arrayWalkRecursive($_COOKIE, 'stripslashes', true);