Fixed bug #55371 (get_magic_quotes_gpc() throws deprecation warning.)

Patch by David Zuelke <david dot zuelke at bitextender dot com>

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 86f97efedfabf2d391cdb6bc48d796a88607a773..3e65c024274fbfeb7fa852d63a90c4c976ad0d0d 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -2961,8 +2961,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 b1c694a72068eccca1f85f00835bf2b8db5c71e8..75cde18b0875b22c9d1683bbd964aa935f21d3a3 100644 (file)
--- 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 abcef3577c372998ce68532b7f13b04fd49d82e9..4106ee9eea0d3b50f9922dabd0e6e7ecc97168db 100644 (file)
--- 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 3e5f6f0ff7420df8adffc1b6939a975b026d450f..ad786fb5258bef4eefeb2ec0476272240de0138a 100644 (file)
--- 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:  --