From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 3 Oct 2006 22:18:08 +0000 (+0000)
Subject: Shoehorn myself into the credits.
X-Git-Tag: php-5.2.0RC5~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c67068b52b95339efead2ee0404e464db64c5863;p=php

Shoehorn myself into the credits.
---

diff --git a/ext/filter/CREDITS b/ext/filter/CREDITS
index 19cfe1d8db..8d75401f77 100644
--- 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 28a672060f..9735c0962d 100644
--- 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 28ad122a5b..1c2c914c55 100644
--- 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>