From: David Soria Parra Date: Tue, 15 Nov 2011 13:22:52 +0000 (+0000) Subject: Fixed bug #55371 (get_magic_quotes_gpc() throws deprecation warning.) X-Git-Tag: php-5.4.0RC2~76 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13ba2da5f602cada0da29f369e95ef0ee47457e0;p=php Fixed bug #55371 (get_magic_quotes_gpc() throws deprecation warning.) Patch by David Zuelke --- diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 26b36a0d58..5162512874 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -2959,8 +2959,8 @@ const zend_function_entry basic_functions[] = { /* {{{ */ PHP_DEP_FALIAS(magic_quotes_runtime, set_magic_quotes_runtime, arginfo_set_magic_quotes_runtime) PHP_DEP_FE(set_magic_quotes_runtime, arginfo_set_magic_quotes_runtime) - PHP_DEP_FE(get_magic_quotes_gpc, arginfo_get_magic_quotes_gpc) - PHP_DEP_FE(get_magic_quotes_runtime, arginfo_get_magic_quotes_runtime) + PHP_FE(get_magic_quotes_gpc, arginfo_get_magic_quotes_gpc) + PHP_FE(get_magic_quotes_runtime, arginfo_get_magic_quotes_runtime) PHP_FE(error_log, arginfo_error_log) PHP_FE(error_get_last, arginfo_error_get_last) diff --git a/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt b/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt index b1c694a720..75cde18b08 100644 --- a/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt +++ b/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt @@ -17,14 +17,10 @@ var_dump(get_magic_quotes_gpc(true)); ===DONE=== --EXPECTF-- Simple testcase for get_magic_quotes_gpc() function - -Deprecated: Function get_magic_quotes_gpc() is deprecated in %s on line %d bool(false) -- Error cases -- -Deprecated: Function get_magic_quotes_gpc() is deprecated in %s on line %d - Warning: get_magic_quotes_gpc() expects exactly 0 parameters, 1 given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt b/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt index abcef3577c..4106ee9eea 100644 --- a/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt +++ b/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt @@ -18,14 +18,10 @@ var_dump(get_magic_quotes_runtime(true)); ===DONE=== --EXPECTF-- Simple testcase for get_magic_quotes_runtime() function - -Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d bool(false) -- Error cases -- -Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d - Warning: get_magic_quotes_runtime() expects exactly 0 parameters, 1 given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt b/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt index 3e5f6f0ff7..ad786fb525 100644 --- a/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt +++ b/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt @@ -28,8 +28,6 @@ echo "\n-- magic quotes runtime after set: " . $g . " --\n"; --EXPECTF-- Simple testcase for set_magic_quotes_runtime() function - basic test -Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d - -- magic quotes runtime set in INI file: -- -- Set magic quotes runtime to 0: -- @@ -37,8 +35,6 @@ Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d bool(false) -Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d - -- magic quotes runtime after set: -- -- Set magic quotes runtime to 1: --