diff options
| author | Hannes Magnusson <bjori@php.net> | 2008-05-25 14:06:15 +0000 |
|---|---|---|
| committer | Hannes Magnusson <bjori@php.net> | 2008-05-25 14:06:15 +0000 |
| commit | 5b398bf78de82857c25e74a59613b30a94d4d951 (patch) | |
| tree | 927e891b469ea878d6acb27b4f90fb2ae2f69302 /ext | |
| parent | 0cfdd9a7e078c5317e328df5444c5c5a2a11e5df (diff) | |
| download | php-git-5b398bf78de82857c25e74a59613b30a94d4d951.tar.gz | |
Remove E_DEPRECATED from get_magic_quotes_*()
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/basic_functions.c | 4 | ||||
| -rw-r--r-- | ext/standard/tests/file/magic_quotes.phpt | 13 |
2 files changed, 2 insertions, 15 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index feb150ccd2..fdddcb1b63 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -3347,8 +3347,8 @@ const zend_function_entry basic_functions[] = { /* {{{ */ 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) diff --git a/ext/standard/tests/file/magic_quotes.phpt b/ext/standard/tests/file/magic_quotes.phpt index 984d3d5c5c..29dc931078 100644 --- a/ext/standard/tests/file/magic_quotes.phpt +++ b/ext/standard/tests/file/magic_quotes.phpt @@ -43,36 +43,25 @@ var_dump(file_get_contents($filename)); 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 @@ bool(true) 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 |