clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Use PHP_DEP_FE and PHP_DEP_FALIAS (magic_quotes related functions)

Browse Source
This commit is contained in:
Felipe Pena 2008-05-08 22:21:19 +00:00
parent 1e650ca32d
commit 3e56d46fa1
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ext/standard/basic_functions.c
View File

@ -3345,10 +3345,10 @@ const zend_function_entry basic_functions[] = { /* {{{ */
PHP_FE(set_time_limit, arginfo_set_time_limit)
PHP_FE(get_cfg_var, arginfo_get_cfg_var)
PHP_FALIAS(magic_quotes_runtime, set_magic_quotes_runtime, NULL)
PHP_FE(set_magic_quotes_runtime, NULL)
PHP_FE(get_magic_quotes_gpc, NULL)
PHP_FE(get_magic_quotes_runtime, NULL)
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(import_request_variables, arginfo_import_request_variables)
PHP_FE(error_log, arginfo_error_log)
@ -4927,8 +4927,6 @@ PHP_FUNCTION(set_magic_quotes_runtime)
RETURN_FALSE;
}
php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "This function is deprecated and removed in PHP 6. See http://php.net/{migrate}#set_magic_quotes_runtime for details.");
convert_to_boolean_ex(new_setting);
PG(magic_quotes_runtime) = (zend_bool) Z_LVAL_PP(new_setting);
@ -4940,7 +4938,6 @@ PHP_FUNCTION(set_magic_quotes_runtime)
Get the current active configuration setting of magic_quotes_runtime */
PHP_FUNCTION(get_magic_quotes_runtime)
{
php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "This function is deprecated and removed in PHP 6. See http://php.net/{migrate}#get_magic_quotes_runtime for details.");
RETURN_LONG(PG(magic_quotes_runtime));
}
/* }}} */
@ -4949,7 +4946,6 @@ PHP_FUNCTION(get_magic_quotes_runtime)
Get the current active configuration setting of magic_quotes_gpc */
PHP_FUNCTION(get_magic_quotes_gpc)
{
php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "This function is deprecated and removed in PHP 6. See http://php.net/{migrate}#get_magic_quotes_gpc for details.");
RETURN_LONG(PG(magic_quotes_gpc));
}
/* }}} */

26
ext/standard/tests/file/magic_quotes.phpt
View File

@ -43,44 +43,46 @@ var_dump(file_get_contents($filename));
echo "Done\n";
?>
--EXPECTF--
Deprecated: get_magic_quotes_runtime(): This function is deprecated and removed in PHP 6. See http://php.net/%s#get_magic_quotes_runtime for details. in %s on line %d
Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d
int(0)
Deprecated: get_magic_quotes_runtime(): This function is deprecated and removed in PHP 6. See http://php.net/%s#get_magic_quotes_runtime for details. in %s on line %d
Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d
int(0)
Deprecated: set_magic_quotes_runtime(): This function is deprecated and removed in PHP 6. See http://php.net/%s#set_magic_quotes_runtime for details. in %s on line %d
Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d
bool(true)
Deprecated: get_magic_quotes_runtime(): This function is deprecated and removed in PHP 6. See http://php.net/%s#get_magic_quotes_runtime for details. in %s on line %d
Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d
int(1)
Deprecated: set_magic_quotes_runtime(): This function is deprecated and removed in PHP 6. See http://php.net/%s#set_magic_quotes_runtime for details. in %s on line %d
Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d
bool(true)
Deprecated: get_magic_quotes_runtime(): This function is deprecated and removed in PHP 6. See http://php.net/%s#get_magic_quotes_runtime for details. in %s on line %d
Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d
int(1)
string(30) "some\'content\'here\"and}there"
Deprecated: set_magic_quotes_runtime(): This function is deprecated and removed in PHP 6. See http://php.net/%s#set_magic_quotes_runtime for details. in %s on line %d
Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d
bool(true)
Deprecated: get_magic_quotes_runtime(): This function is deprecated and removed in PHP 6. See http://php.net/%s#get_magic_quotes_runtime for details. in %s on line %d
Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d
int(0)
string(27) "some'content'here"and}there"
Deprecated: set_magic_quotes_runtime(): This function is deprecated and removed in PHP 6. See http://php.net/%s#set_magic_quotes_runtime for details. in %s on line %d
Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d
bool(true)
Deprecated: get_magic_quotes_runtime(): This function is deprecated and removed in PHP 6. See http://php.net/%s#get_magic_quotes_runtime for details. in %s on line %d
Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d
int(1)
string(30) "some\'content\'here\"and}there"
Deprecated: set_magic_quotes_runtime(): This function is deprecated and removed in PHP 6. See http://php.net/%s#set_magic_quotes_runtime for details. in %s on line %d
Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d
bool(true)
Deprecated: Function set_magic_quotes_runtime() is deprecated in %s on line %d
bool(false)
Deprecated: get_magic_quotes_runtime(): This function is deprecated and removed in PHP 6. See http://php.net/%s#get_magic_quotes_runtime for details. in %s on line %d
Deprecated: Function get_magic_quotes_runtime() is deprecated in %s on line %d
int(0)
string(27) "some'content'here"and}there"
Done