bjori Sun May 25 14:06:15 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard basic_functions.c
/php-src/ext/standard/tests/file magic_quotes.phpt
Log:
Remove E_DEPRECATED from get_magic_quotes_*()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.34&r2=1.725.2.31.2.64.2.35&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.34
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.35
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.34 Mon May 12
08:47:01 2008
+++ php-src/ext/standard/basic_functions.c Sun May 25 14:06:13 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.34 2008/05/12 08:47:01 tony2001
Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.35 2008/05/25 14:06:13 bjori Exp
$ */
#include "php.h"
#include "php_streams.h"
@@ -3347,8 +3347,8 @@
PHP_DEP_FALIAS(magic_quotes_runtime, set_magic_quotes_runtime,
NULL)
PHP_DEP_FE(set_magic_quotes_runtime,
NULL)
- PHP_DEP_FE(get_magic_quotes_gpc,
NULL)
- PHP_DEP_FE(get_magic_quotes_runtime,
NULL)
+ PHP_FE(get_magic_quotes_gpc,
NULL)
+ PHP_FE(get_magic_quotes_runtime,
NULL)
PHP_FE(import_request_variables,
arginfo_import_request_variables)
PHP_FE(error_log,
arginfo_error_log)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/magic_quotes.phpt?r1=1.1.2.1.2.3&r2=1.1.2.1.2.4&diff_format=u
Index: php-src/ext/standard/tests/file/magic_quotes.phpt
diff -u php-src/ext/standard/tests/file/magic_quotes.phpt:1.1.2.1.2.3
php-src/ext/standard/tests/file/magic_quotes.phpt:1.1.2.1.2.4
--- php-src/ext/standard/tests/file/magic_quotes.phpt:1.1.2.1.2.3 Thu May
8 22:21:19 2008
+++ php-src/ext/standard/tests/file/magic_quotes.phpt Sun May 25 14:06:15 2008
@@ -43,36 +43,25 @@
echo "Done\n";
?>
--EXPECTF--
-Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d
int(0)
-
-Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d
int(0)
Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d
bool(true)
-
-Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d
int(1)
Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d
bool(true)
-
-Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d
int(1)
string(30) "some\'content\'here\"and}there"
Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d
bool(true)
-
-Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d
int(0)
string(27) "some'content'here"and}there"
Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d
bool(true)
-
-Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d
int(1)
string(30) "some\'content\'here\"and}there"
@@ -81,8 +70,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
int(0)
string(27) "some'content'here"and}there"
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
