- fix logic, scalar is the default

This commit is contained in:
Pierre Joye 2006-05-09 00:46:31 +00:00
parent f03e94f985
commit f8c8a13e18

View File

@ -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) {