From: Pierre Joye <pajoye@php.net>
Date: Wed, 4 Apr 2007 20:51:42 +0000 (+0000)
Subject: - MFB: #40947, allow a single filter as argument for filter_var_arra
X-Git-Tag: RELEASE_1_1_0~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55d634b6a9601ab16ad7d60bae1859cbe56bfca3;p=php

- MFB: #40947, allow a single filter as argument for filter_var_arra
---

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index f8b0b4714e..dcccd44d25 100644
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -784,8 +784,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;
 	}
 
@@ -823,8 +825,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;
 	}