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

This commit is contained in:
Pierre Joye 2007-04-04 20:51:42 +00:00
parent 2c72351711
commit 55d634b6a9

View File

@ -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;
}