pollita Tue Jan 7 11:43:27 2003 EDT
Modified files:
/php4/ext/standard user_filters.c
Log:
Backout changes between 1.6 and 1.7
Index: php4/ext/standard/user_filters.c
diff -u php4/ext/standard/user_filters.c:1.8 php4/ext/standard/user_filters.c:1.9
--- php4/ext/standard/user_filters.c:1.8 Tue Jan 7 03:57:27 2003
+++ php4/ext/standard/user_filters.c Tue Jan 7 11:43:26 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: user_filters.c,v 1.8 2003/01/07 08:57:27 moriyoshi Exp $ */
+/* $Id: user_filters.c,v 1.9 2003/01/07 16:43:26 pollita Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -414,27 +414,21 @@
{
}
-/* {{{ 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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php