drop deprecated funcs and change error level to E_WARNING

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 2dc28e4c227a81314ea26eab0b7892a37b5f2469..8c76d408fff293754e52ddad4814bbe7b429c23c 100644 (file)
--- 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 1af4b17142032f823765cb250e03a878f94484de..9f2a276908ef72b6a0aa97c33a51600ede86224d 100644 (file)
--- 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;
                }