cvs: php-src /ext/spl spl_directory.c
| From: | Etienne Kneuss | Date: | Sat, 03 May 2008 16:01:00 +0000 |
| Subject: | cvs: php-src /ext/spl spl_directory.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-49820@lists.php.net to get a copy of this message | ||
colder Sat May 3 16:01:00 2008 UTC
Modified files:
/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.151&r2=1.152&diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.151 php-src/ext/spl/spl_directory.c:1.152
--- php-src/ext/spl/spl_directory.c:1.151 Wed Apr 9 19:00:48 2008
+++ php-src/ext/spl/spl_directory.c Sat May 3 16:01:00 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.c,v 1.151 2008/04/09 19:00:48 colder Exp $ */
+/* $Id: spl_directory.c,v 1.152 2008/05/03 16:01:00 colder Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1276,7 +1276,7 @@
ZVAL_LONG(&zflags, intern->flags);
ZVAL_ZSTRL(&zpath, intern->file_name_type, intern->file_name, intern->file_name_len,
1);
- spl_instantiate_arg_ex2(spl_ce_RecursiveDirectoryIterator, &return_value, 0, &zpath,
&zflags TSRMLS_CC);
+ spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), &return_value, 0, &zpath, &zflags
TSRMLS_CC);
zval_dtor(&zpath);