felipe Thu May 8 22:21:19 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard basic_functions.c
/php-src/ext/standard/tests/file magic_quotes.phpt
Log:
- Use PHP_DEP_FE and PHP_DEP_FALIAS (magic_quotes related functions)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.32&r2=1.725.2.31.2.64.2.33&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.32
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.33
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.32 Tue May 6
18:01:32 2008
+++ php-src/ext/standard/basic_functions.c Thu May 8 22:21:18 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.32 2008/05/06 18:01:32 iliaa Exp
$ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.33 2008/05/08 22:21:18 felipe
Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -3345,10 +3345,10 @@
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 @@
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 @@
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 @@
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));
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/magic_quotes.phpt?r1=1.1.2.1.2.2&r2=1.1.2.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/file/magic_quotes.phpt
diff -u php-src/ext/standard/tests/file/magic_quotes.phpt:1.1.2.1.2.2
php-src/ext/standard/tests/file/magic_quotes.phpt:1.1.2.1.2.3
--- php-src/ext/standard/tests/file/magic_quotes.phpt:1.1.2.1.2.2 Sun Feb
24 11:27:26 2008
+++ php-src/ext/standard/tests/file/magic_quotes.phpt Thu May 8 22:21:19 2008
@@ -43,44 +43,46 @@
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
