]> granicus.if.org Git - php/commitdiff
- fix logic, scalar is the default
authorPierre Joye <pajoye@php.net>
Tue, 9 May 2006 00:46:31 +0000 (00:46 +0000)
committerPierre Joye <pajoye@php.net>
Tue, 9 May 2006 00:46:31 +0000 (00:46 +0000)
ext/filter/filter.c

index 72fd5d59e0be797645070cd16437bcf03764b57e..079df3f3dffb9f962ab761842c9ed601cbd329a9 100644 (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) {