cvs: php-src /ext/spl spl_directory.c

helly Mon Feb 4 18:46:02 2008 UTC Modified files: /php-src/ext/spl spl_directory.c Log: - Fix #44018 (RecursiveDirectoryIterator options inconsistancy) http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.145&r2=1.146&diff_format=u Index: php-src/ext/spl/spl_directory.c diff -u php-src/ext/spl/spl_directory.c:1.145 php-src/ext/spl/spl_directory.c:1.146 --- php-src/ext/spl/spl_directory.c:1.145 Mon Feb 4 18:35:08 2008 +++ php-src/ext/spl/spl_directory.c Mon Feb 4 18:46:02 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_directory.c,v 1.145 2008/02/04 18:35:08 helly Exp $ */ +/* $Id: spl_directory.c,v 1.146 2008/02/04 18:46:02 helly Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -602,10 +602,8 @@ php_set_error_handling(EH_THROW, spl_ce_RuntimeException TSRMLS_CC); if (ctor_flags & DIT_CTOR_FLAGS) { - flags = SPL_FILE_DIR_CURRENT_AS_FILEINFO; parsed = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t|l", &path, &len, &path_type, &flags); } else { - flags = 0; parsed = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t", &path, &len, &path_type); } if (parsed == FAILURE) {