archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

- fix logic, scalar is the default

Browse source
This commit is contained in:
Pierre Joye 2006-05-09 00:46:31 +00:00
parent f03e94f985
commit f8c8a13e18
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/filter/filter.c
View file

@ -740,9 +740,7 @@ PHP_FUNCTION(input_get_args)
} }
} }
if (filter_flags & FILTER_FLAG_SCALAR) { if (filter_flags & FILTER_FLAG_ARRAY) {
php_zval_filter(*tmp, filter, filter_flags, options, charset TSRMLS_CC);
} else {
php_zval_filter_recursive(*tmp, filter, filter_flags, options, charset TSRMLS_CC); php_zval_filter_recursive(*tmp, filter, filter_flags, options, charset TSRMLS_CC);
/* ARRAY always returns an array */ /* ARRAY always returns an array */
@ -752,6 +750,8 @@ PHP_FUNCTION(input_get_args)
add_next_index_zval(temparray, *tmp); add_next_index_zval(temparray, *tmp);
*tmp = temparray; *tmp = temparray;
} }
} else {
php_zval_filter(*tmp, filter, filter_flags, options, charset TSRMLS_CC);
} }
if (Z_TYPE_PP(tmp) == IS_NULL) { if (Z_TYPE_PP(tmp) == IS_NULL) {