colder Sat May 3 16:00:40 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/spl spl_directory.c
Log:
MFB: Fix #44838 (static class reference restricting overwriting)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.26&r2=1.45.2.27.2.27&diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.27.2.26
php-src/ext/spl/spl_directory.c:1.45.2.27.2.27
--- php-src/ext/spl/spl_directory.c:1.45.2.27.2.26 Wed Feb 13 12:23:26 2008
+++ php-src/ext/spl/spl_directory.c Sat May 3 16:00:40 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.c,v 1.45.2.27.2.26 2008/02/13 12:23:26 helly Exp $ */
+/* $Id: spl_directory.c,v 1.45.2.27.2.27 2008/05/03 16:00:40 colder Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1055,7 +1055,7 @@
INIT_PZVAL(&zpath);
ZVAL_STRINGL(&zpath, intern->file_name, intern->file_name_len, 0);
- spl_instantiate_arg_ex1(spl_ce_RecursiveDirectoryIterator,
&return_value, 0, &zpath TSRMLS_CC);
+ spl_instantiate_arg_ex1(Z_OBJCE_P(getThis()), &return_value, 0, &zpath
TSRMLS_CC);
subdir =
(spl_filesystem_object*)zend_object_store_get_object(return_value TSRMLS_CC);
if (subdir) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
