From: Ilia Alshanetsky <iliaa@php.net>
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.2.13RC1~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=57399bceea5e411c87f1dff5ee7e5b88ac2cdcb2;p=php

Fixed bug #50632 (filter_input() does not return default value if the variable does not exist)
---

diff --git a/NEWS b/NEWS
index 3e2ebfc70b..ee8df5944d 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,8 @@ PHP                                                                        NEWS
 
 - Fixed bug #50636 (MySQLi_Result sets values before calling constructor).
   (Pierrick)
+- Fixed bug #50632 (filter_input() does not return default value if the
+  variable does not exist). (Ilia)
 - Fixed bug #50575 (PDO_PGSQL LOBs are not compatible with PostgreSQL 8.5).
   (Matteo)
 - Fixed bug #50558 (Broken object model when extending tidy). (Pierrick)
diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index e631b80034..2be7fb2f7e 100644
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -728,7 +728,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