From: Pierre Joye <pajoye@php.net>
Date: Wed, 4 Apr 2007 20:50:26 +0000 (+0000)
Subject: - #40947, allow a single filter as argument for filter_var_array
X-Git-Tag: php-5.2.2RC1~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2caba30962c4c1216a22eb63848c412764f51ec5;p=php

- #40947, allow a single filter as argument for filter_var_array
---

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 45cf86004c..dff2ea65b0 100644
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -776,8 +776,10 @@ PHP_FUNCTION(filter_input_array)
 		return;
 	}
 
-	if (op && ( (Z_TYPE_PP(op) == IS_LONG && !PHP_FILTER_ID_EXISTS(Z_LVAL_PP(op)))
-		|| Z_TYPE_PP(op) != IS_ARRAY)) {
+	if (op
+		&& (Z_TYPE_PP(op) != IS_ARRAY)
+		&& (Z_TYPE_PP(op) == IS_LONG && !PHP_FILTER_ID_EXISTS(Z_LVAL_PP(op)))
+		) {
 		RETURN_FALSE;
 	}
 
@@ -815,8 +817,10 @@ PHP_FUNCTION(filter_var_array)
 		return;
 	}
 
-	if (op && ( (Z_TYPE_PP(op) == IS_LONG && !PHP_FILTER_ID_EXISTS(Z_LVAL_PP(op)))
-		|| Z_TYPE_PP(op) != IS_ARRAY)) {
+	if (op
+		&& (Z_TYPE_PP(op) != IS_ARRAY)
+		&& (Z_TYPE_PP(op) == IS_LONG && !PHP_FILTER_ID_EXISTS(Z_LVAL_PP(op)))
+		) {
 		RETURN_FALSE;
 	}