iliaa Tue Oct 3 22:18:08 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/filter CREDITS filter.c package.xml
Log:
Shoehorn myself into the credits.
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/CREDITS?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/filter/CREDITS
diff -u php-src/ext/filter/CREDITS:1.1.2.1 php-src/ext/filter/CREDITS:1.1.2.2
--- php-src/ext/filter/CREDITS:1.1.2.1 Thu Aug 31 22:34:32 2006
+++ php-src/ext/filter/CREDITS Tue Oct 3 22:18:08 2006
@@ -1,2 +1,2 @@
Input Filter
-Rasmus Lerdorf, Derick Rethans, Pierre-Alain Joye
+Rasmus Lerdorf, Derick Rethans, Pierre-Alain Joye, Ilia Alshanetsky
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.21&r2=1.52.2.22&diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.21
php-src/ext/filter/filter.c:1.52.2.22
--- php-src/ext/filter/filter.c:1.52.2.21 Tue Oct 3 15:34:50 2006
+++ php-src/ext/filter/filter.c Tue Oct 3 22:18:08 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.52.2.21 2006/10/03 15:34:50 iliaa Exp $ */
+/* $Id: filter.c,v 1.52.2.22 2006/10/03 22:18:08 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -274,7 +274,7 @@
{
php_info_print_table_start();
php_info_print_table_header( 2, "Input Validation and Filtering",
"enabled" );
- php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.21 $");
+ php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.22 $");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -533,6 +533,10 @@
if (zend_hash_find(HASH_OF(*filter_args), "flags",
sizeof("flags"), (void **)&option) == SUCCESS) {
convert_to_long(*option);
filter_flags = Z_LVAL_PP(option);
+
+ if (!(filter_flags & FILTER_REQUIRE_ARRAY ||
filter_flags & FILTER_FORCE_ARRAY)) {
+ filter_flags |= FILTER_REQUIRE_SCALAR;
+ }
}
if (zend_hash_find(HASH_OF(*filter_args), "options",
sizeof("options"), (void **)&option) == SUCCESS) {
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/package.xml?r1=1.22.2.2&r2=1.22.2.3&diff_format=u
Index: php-src/ext/filter/package.xml
diff -u php-src/ext/filter/package.xml:1.22.2.2
php-src/ext/filter/package.xml:1.22.2.3
--- php-src/ext/filter/package.xml:1.22.2.2 Thu Aug 31 22:34:32 2006
+++ php-src/ext/filter/package.xml Tue Oct 3 22:18:08 2006
@@ -8,6 +8,12 @@
</description>
<lead>
+ <name>Ilia Alshanetsky</name>
+ <user>iliaa</user>
+ <email>[EMAIL PROTECTED]</email>
+ <active>yes</active>
+ </lead>
+ <lead>
<name>Pierre-Alain Joye</name>
<user>pajoye</user>
<email>[EMAIL PROTECTED]</email>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
