- Make passing filter flags as LONG work again.

- Make super globals filtering work again (as quick workaround).
#- Will merge to head later... need to get things sorted out first.

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 5766b190c16e57a8238effb88827bf1ae40bb20c..70aa42ec0d0b84dca5cf569d3cefcf84371b96bb 100644 (file)
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -312,7 +312,7 @@ static void php_zval_filter(zval **value, long filter, long flags, zval *options
                filter_func = php_find_filter(FILTER_DEFAULT);
        }
 
-       SEPARATE_ZVAL(value);
+       /* Comment this out until there is a better solution: SEPARATE_ZVAL(value); */
        /* Here be strings */
        convert_to_string(*value);
 
@@ -634,7 +634,7 @@ PHP_FUNCTION(input_get)
                                break;
                        }
                } else {
-                       filter_flags = FILTER_FLAG_SCALAR;
+                       filter_flags = filter_flags | FILTER_FLAG_SCALAR;
                }
 
                zval_copy_ctor(return_value);  /* Watch out for empty strings */

diff --git a/ext/filter/filter_private.h b/ext/filter/filter_private.h
index 74342a90df13eaf433e0ac071fa66c74b7894776..e18bcbe1c9d91347e8135fa68a91ac9fc5a8f578 100644 (file)
--- a/ext/filter/filter_private.h
+++ b/ext/filter/filter_private.h
@@ -24,7 +24,7 @@
 #define FILTER_FLAG_NONE                    0x0000
 
 #define FILTER_FLAG_ARRAY                   0x1000000
-#define FILTER_FLAG_SCALAR                           0x2000000
+#define FILTER_FLAG_SCALAR                  0x2000000
 
 #define FILTER_FLAG_ALLOW_OCTAL             0x0001
 #define FILTER_FLAG_ALLOW_HEX               0x0002