Shoehorn myself into the credits.

diff --git a/ext/filter/CREDITS b/ext/filter/CREDITS
index 19cfe1d8db580cd6ff8c5bd8aac58b04ca574eb5..8d75401f779b52a7732c127711aee7ee2166e963 100644 (file)
--- a/ext/filter/CREDITS
+++ b/ext/filter/CREDITS
@@ -1,2 +1,2 @@
 Input Filter
-Rasmus Lerdorf, Derick Rethans, Pierre-Alain Joye
+Rasmus Lerdorf, Derick Rethans, Pierre-Alain Joye, Ilia Alshanetsky

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 28a672060fa2540498ec33957447e03125c0b68e..9735c0962db732df6e2d3ee6c483d141004c7b7d 100644 (file)
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -533,6 +533,10 @@ static void php_filter_call(zval **filtered, long filter, zval **filter_args, co
                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) {

diff --git a/ext/filter/package.xml b/ext/filter/package.xml
index 28ad122a5b44c1f99373b5ba6cc819533171a51e..1c2c914c555e4c9e344fbe8d65e13842a051b417 100644 (file)
--- a/ext/filter/package.xml
+++ b/ext/filter/package.xml
@@ -7,6 +7,12 @@
 of filters and mechanisms that users can use to safely access their input data.
  
  </description>
+  <lead>
+    <name>Ilia Alshanetsky</name>
+    <user>iliaa</user>
+    <email>iliaa@php.net</email>
+    <active>yes</active>
+  </lead>
   <lead>
     <name>Pierre-Alain Joye</name>
     <user>pajoye</user>