From: Sara Golemon <pollita@php.net>
Date: Tue, 7 Jan 2003 16:43:26 +0000 (+0000)
Subject: Backout changes between 1.6 and 1.7
X-Git-Tag: PHP_5_0_dev_before_13561_fix~393
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4f313ff40477415aa979c87d66ce27d275feff0;p=php

Backout changes between 1.6 and 1.7
---

diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c
index 7280d505cb..f26c126b64 100644
--- 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);