tony2001 Wed Mar 28 10:22:33 2007 UTC
Modified files:
/php-src/main main.c
/php-src/ext/standard basic_functions.c
Log:
drop deprecated funcs and change error level to E_WARNING
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.723&r2=1.724&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.723 php-src/main/main.c:1.724
--- php-src/main/main.c:1.723 Fri Mar 2 22:04:46 2007
+++ php-src/main/main.c Wed Mar 28 10:22:32 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.723 2007/03/02 22:04:46 stas Exp $ */
+/* $Id: main.c,v 1.724 2007/03/28 10:22:32 tony2001 Exp $ */
/* {{{ includes
*/
@@ -1672,7 +1672,7 @@
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;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.852&r2=1.853&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.852
php-src/ext/standard/basic_functions.c:1.853
--- php-src/ext/standard/basic_functions.c:1.852 Thu Mar 8 00:43:05 2007
+++ php-src/ext/standard/basic_functions.c Wed Mar 28 10:22:33 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.852 2007/03/08 00:43:05 tony2001 Exp $ */
+/* $Id: basic_functions.c,v 1.853 2007/03/28 10:22:33 tony2001 Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -3413,10 +3413,6 @@
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 @@
}
/* }}} */
-/* {{{ 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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
