From: Ilia Alshanetsky Date: Sun, 3 Jan 2010 22:58:37 +0000 (+0000) Subject: Fixed bug #50632 (filter_input() does not return default value if the variable does... X-Git-Tag: php-5.4.0alpha1~191^2~2140 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cca54a95c11e046b59944e505d153854f50731ab;p=php Fixed bug #50632 (filter_input() does not return default value if the variable does not exist) --- diff --git a/ext/filter/filter.c b/ext/filter/filter.c index e3ced880c4..fd3fd9351b 100644 --- a/ext/filter/filter.c +++ b/ext/filter/filter.c @@ -781,7 +781,8 @@ PHP_FUNCTION(filter_input) filter_flags = Z_LVAL_PP(filter_args); } else if (Z_TYPE_PP(filter_args) == IS_ARRAY && zend_hash_find(HASH_OF(*filter_args), "flags", sizeof("flags"), (void **)&option) == SUCCESS) { PHP_FILTER_GET_LONG_OPT(option, filter_flags); - } else if (Z_TYPE_PP(filter_args) == IS_ARRAY && + } + if (Z_TYPE_PP(filter_args) == IS_ARRAY && zend_hash_find(HASH_OF(*filter_args), "options", sizeof("options"), (void **)&opt) == SUCCESS && Z_TYPE_PP(opt) == IS_ARRAY && zend_hash_find(HASH_OF(*opt), "default", sizeof("default"), (void **)&def) == SUCCESS