From: Pierre Joye <pajoye@php.net>
Date: Tue, 9 May 2006 00:46:31 +0000 (+0000)
Subject: - fix logic, scalar is the default
X-Git-Tag: BEFORE_NEW_OUTPUT_API~267
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8c8a13e186650ca7531e80ea650cc4f5eb7833e;p=php

- fix logic, scalar is the default
---

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