- 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 f8b0b4714e1eac293954be410f8154200af65c7e..dcccd44d255c3294304ebdb68467d40fd4d51328 100644 (file)
--- 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;
        }