Backout changes between 1.6 and 1.7

diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c
index 7280d505cb73d45e6593711bf9f8ace43d92803d..f26c126b6481b28c10c948463114d6d48ebad110 100644 (file)
--- a/ext/standard/user_filters.c
+++ b/ext/standard/user_filters.c
@@ -414,27 +414,21 @@ static void filter_item_dtor(struct php_user_filter_data *fdat)
 {
 }
 
-/* {{{ proto array stream_get_filters([bool system])
+/* {{{ proto array stream_get_filters(void)
    Returns a list of registered filters */
 PHP_FUNCTION(stream_get_filters)
 {
        char *filter_name;
        int key_flags, filter_name_len = 0;
-       zend_bool return_system = 0;
        HashTable *filters_hash;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &return_system) == FAILURE) {
-               RETURN_FALSE;
+       if (ZEND_NUM_ARGS() != 0) {
+               WRONG_PARAM_COUNT;
        }
 
        array_init(return_value);
 
-       /* TODO: Bug #21487 */
-
-       if (return_system)
-               filters_hash = php_get_stream_filters_hash();
-       else
-               filters_hash = BG(user_filter_map);
+       filters_hash = php_get_stream_filters_hash();
 
        if (filters_hash) {
                for(zend_hash_internal_pointer_reset(filters_hash);