diff options
| author | Antony Dovgal <tony2001@php.net> | 2007-03-28 10:22:33 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2007-03-28 10:22:33 +0000 |
| commit | b3352b6a04811d8c5cf9369aeee802778638ad87 (patch) | |
| tree | 4e4589b96815d6b698d6d7ce19f5fc3764f98fee | |
| parent | 25c075ec4bc546f3f71e54fb00a91ccb108823e2 (diff) | |
| download | php-git-b3352b6a04811d8c5cf9369aeee802778638ad87.tar.gz | |
drop deprecated funcs and change error level to E_WARNING
| -rw-r--r-- | ext/standard/basic_functions.c | 29 | ||||
| -rw-r--r-- | main/main.c | 2 |
2 files changed, 1 insertions, 30 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 2dc28e4c22..8c76d408ff 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -3413,10 +3413,6 @@ zend_function_entry basic_functions[] = { PHP_FE(get_current_user, arginfo_get_current_user) PHP_FE(set_time_limit, arginfo_set_time_limit) PHP_FE(get_cfg_var, arginfo_get_cfg_var) - 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) @@ -4834,31 +4830,6 @@ PHP_FUNCTION(get_cfg_var) } /* }}} */ -/* {{{ proto false set_magic_quotes_runtime(void) U - Deprecation stub for magic quotes function */ -PHP_FUNCTION(set_magic_quotes_runtime) -{ - php_error_docref(NULL TSRMLS_CC, E_CORE_ERROR, "magic_quotes_runtime is not supported anymore"); - RETURN_FALSE; -} -/* }}} */ - -/* {{{ proto false get_magic_quotes_runtime(void) U - Deprecation stub for magic quotes function */ -PHP_FUNCTION(get_magic_quotes_runtime) -{ - RETURN_FALSE; -} -/* }}} */ - -/* {{{ proto false get_magic_quotes_gpc(void) U - Deprecation stub for magic quotes function */ -PHP_FUNCTION(get_magic_quotes_gpc) -{ - RETURN_FALSE; -} -/* }}} */ - /* 1st arg = error message 2nd arg = error option diff --git a/main/main.c b/main/main.c index 1af4b17142..9f2a276908 100644 --- a/main/main.c +++ b/main/main.c @@ -1672,7 +1672,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod while (*p) { if (cfg_get_long((char*)*p, &val) == SUCCESS && val) { - zend_error(E_CORE_ERROR, "Directive '%s' is no longer supported in PHP 6 and greater", *p); + zend_error(E_WARNING, "Directive '%s' is no longer supported in PHP 6 and greater", *p); } ++p; } |