cvs: php-src(PHP_5_2) /ext/filter filter.c
| From: | Antony Dovgal | Date: | Mon, 13 Nov 2006 15:00:05 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/filter filter.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-41520@lists.php.net to get a copy of this message | ||
tony2001 Mon Nov 13 15:00:05 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/filter filter.c
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.26&r2=1.52.2.27&diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.26 php-src/ext/filter/filter.c:1.52.2.27
--- php-src/ext/filter/filter.c:1.52.2.26 Fri Nov 10 01:08:17 2006
+++ php-src/ext/filter/filter.c Mon Nov 13 15:00:05 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.52.2.26 2006/11/10 01:08:17 iliaa Exp $ */
+/* $Id: filter.c,v 1.52.2.27 2006/11/13 15:00:05 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -275,7 +275,7 @@
{
php_info_print_table_start();
php_info_print_table_header( 2, "Input Validation and Filtering", "enabled" );
- php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.26 $");
+ php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.27 $");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -609,10 +609,12 @@
if (!op) {
SEPARATE_ZVAL(&input);
*return_value = *input;
+ zval_copy_ctor(return_value);
php_filter_call(&return_value, FILTER_DEFAULT, NULL, 0, FILTER_REQUIRE_ARRAY TSRMLS_CC);
} else if (Z_TYPE_PP(op) == IS_LONG) {
SEPARATE_ZVAL(&input);
*return_value = *input;
+ zval_copy_ctor(return_value);
php_filter_call(&return_value, Z_LVAL_PP(op), NULL, 0, FILTER_REQUIRE_ARRAY TSRMLS_CC);
} else if (Z_TYPE_PP(op) == IS_ARRAY) {
array_init(return_value);