From 55d634b6a9601ab16ad7d60bae1859cbe56bfca3 Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Wed, 4 Apr 2007 20:51:42 +0000 Subject: [PATCH] - MFB: #40947, allow a single filter as argument for filter_var_arra --- ext/filter/filter.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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; } -- 2.50.1