diff options
| author | Pierre Joye <pajoye@php.net> | 2006-05-09 00:46:31 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2006-05-09 00:46:31 +0000 |
| commit | f8c8a13e186650ca7531e80ea650cc4f5eb7833e (patch) | |
| tree | 1efb630f12f5d5e891a3f04187a012cf3cf75981 | |
| parent | f03e94f9855f02eeaaccdf5fa119a1c25bbb33b9 (diff) | |
| download | php-git-f8c8a13e186650ca7531e80ea650cc4f5eb7833e.tar.gz | |
- fix logic, scalar is the default
| -rw-r--r-- | ext/filter/filter.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/filter/filter.c b/ext/filter/filter.c index 72fd5d59e0..079df3f3df 100644 --- a/ext/filter/filter.c +++ b/ext/filter/filter.c @@ -740,9 +740,7 @@ PHP_FUNCTION(input_get_args) } } - if (filter_flags & FILTER_FLAG_SCALAR) { - php_zval_filter(*tmp, filter, filter_flags, options, charset TSRMLS_CC); - } else { + if (filter_flags & FILTER_FLAG_ARRAY) { php_zval_filter_recursive(*tmp, filter, filter_flags, options, charset TSRMLS_CC); /* ARRAY always returns an array */ @@ -752,6 +750,8 @@ PHP_FUNCTION(input_get_args) add_next_index_zval(temparray, *tmp); *tmp = temparray; } + } else { + php_zval_filter(*tmp, filter, filter_flags, options, charset TSRMLS_CC); } if (Z_TYPE_PP(tmp) == IS_NULL) { |