johannes Wed, 27 Jan 2010 17:22:54 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=294106
Log: merge r293051: Fixed bug #50632 (filter_input() does not return default value if the variable does not exist) (iliaa) Bug: http://bugs.php.net/50632 (Closed) Return default value if var is undefined Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/NEWS U php/php-src/branches/PHP_5_3_2/ext/filter/filter.c Property changes on: php/php-src/branches/PHP_5_3_2 ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293974 /php/php-src/trunk:284726 + /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293974 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_3_2/NEWS 2010-01-27 17:07:46 UTC (rev 294105) +++ php/php-src/branches/PHP_5_3_2/NEWS 2010-01-27 17:22:54 UTC (rev 294106) @@ -7,6 +7,8 @@ (Ilia) - Added stream_resolve_include_path(). (Mikko) +- Fixed bug #50632 (filter_input() does not return default value if the + variable does not exist). (Ilia) - Fixed bug #48190 (Content-type parameter "boundary" is not case-insensitive in HTTP uploads). (Ilia) - Fixed bug #47409 (extract() problem with array containing word "this"). Modified: php/php-src/branches/PHP_5_3_2/ext/filter/filter.c =================================================================== --- php/php-src/branches/PHP_5_3_2/ext/filter/filter.c 2010-01-27 17:07:46 UTC (rev 294105) +++ php/php-src/branches/PHP_5_3_2/ext/filter/filter.c 2010-01-27 17:22:54 UTC (rev 294106) @@ -768,7 +768,8 @@ 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
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
