dsp Tue, 15 Nov 2011 13:22:52 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=319249
Log: Fixed bug #55371 (get_magic_quotes_gpc() throws deprecation warning.) Patch by David Zuelke <david dot zuelke at bitextender dot com> Bug: https://bugs.php.net/55371 (Assigned) get_magic_quotes_gpc() throws deprecation warning Changed paths: U php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c U php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt U php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt U php/php-src/trunk/ext/standard/basic_functions.c U php/php-src/trunk/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt U php/php-src/trunk/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt U php/php-src/trunk/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt Modified: php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c 2011-11-15 13:07:47 UTC (rev 319248) +++ php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c 2011-11-15 13:22:52 UTC (rev 319249) @@ -2959,8 +2959,8 @@ 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) Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt 2011-11-15 13:07:47 UTC (rev 319248) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt 2011-11-15 13:22:52 UTC (rev 319249) @@ -17,14 +17,10 @@ ===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=== Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt 2011-11-15 13:07:47 UTC (rev 319248) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt 2011-11-15 13:22:52 UTC (rev 319249) @@ -18,14 +18,10 @@ ===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=== Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt 2011-11-15 13:07:47 UTC (rev 319248) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt 2011-11-15 13:22:52 UTC (rev 319249) @@ -28,8 +28,6 @@ --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 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: -- Modified: php/php-src/trunk/ext/standard/basic_functions.c =================================================================== --- php/php-src/trunk/ext/standard/basic_functions.c 2011-11-15 13:07:47 UTC (rev 319248) +++ php/php-src/trunk/ext/standard/basic_functions.c 2011-11-15 13:22:52 UTC (rev 319249) @@ -2961,8 +2961,8 @@ 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) Modified: php/php-src/trunk/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt =================================================================== --- php/php-src/trunk/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt 2011-11-15 13:07:47 UTC (rev 319248) +++ php/php-src/trunk/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt 2011-11-15 13:22:52 UTC (rev 319249) @@ -17,14 +17,10 @@ ===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=== Modified: php/php-src/trunk/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt =================================================================== --- php/php-src/trunk/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt 2011-11-15 13:07:47 UTC (rev 319248) +++ php/php-src/trunk/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt 2011-11-15 13:22:52 UTC (rev 319249) @@ -18,14 +18,10 @@ ===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=== Modified: php/php-src/trunk/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt =================================================================== --- php/php-src/trunk/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt 2011-11-15 13:07:47 UTC (rev 319248) +++ php/php-src/trunk/ext/standard/tests/general_functions/set_magic_quotes_runtime_basic.phpt 2011-11-15 13:22:52 UTC (rev 319249) @@ -28,8 +28,6 @@ --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 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: --
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
