cvs: pecl /phar phar_object.c
| From: | Marcus Boerger | Date: | Wed, 30 Jan 2008 23:50:22 +0000 |
| Subject: | cvs: pecl /phar phar_object.c | ||
| Groups: | php.pecl.cvs | ||
| Request: | Send a blank email to pecl-cvs+get-9643@lists.php.net to get a copy of this message | ||
helly Wed Jan 30 23:50:22 2008 UTC
Modified files:
/pecl/phar phar_object.c
Log:
- SPL has been changed
http://cvs.php.net/viewvc.cgi/pecl/phar/phar_object.c?r1=1.138&r2=1.139&diff_format=u
Index: pecl/phar/phar_object.c
diff -u pecl/phar/phar_object.c:1.138 pecl/phar/phar_object.c:1.139
--- pecl/phar/phar_object.c:1.138 Wed Jan 30 20:31:07 2008
+++ pecl/phar/phar_object.c Wed Jan 30 23:50:22 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: phar_object.c,v 1.138 2008/01/30 20:31:07 helly Exp $ */
+/* $Id: phar_object.c,v 1.139 2008/01/30 23:50:22 helly Exp $ */
#include "phar_internal.h"
#include "func_interceptors.h"
@@ -1061,7 +1061,9 @@
}
switch (intern->type) {
case SPL_FS_DIR:
-#if PHP_VERSION_ID >= 50300
+#if PHP_VERSION_ID >= 60000
+ test = spl_filesystem_object_get_path(intern, NULL, NULL TSRMLS_CC).s;
+#elif PHP_VERSION_ID >= 50300
test = spl_filesystem_object_get_path(intern, NULL TSRMLS_CC);
#else
test = intern->path;