helly Tue Oct 25 19:20:30 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/spl php_spl.c
Log:
- MFH zend_is_callable_ex() has been changed
http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.52.2.8&r2=1.52.2.9&ty=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.8 php-src/ext/spl/php_spl.c:1.52.2.9
--- php-src/ext/spl/php_spl.c:1.52.2.8 Mon Sep 26 13:56:26 2005
+++ php-src/ext/spl/php_spl.c Tue Oct 25 19:20:29 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_spl.c,v 1.52.2.8 2005/09/26 17:56:26 helly Exp $ */
+/* $Id: php_spl.c,v 1.52.2.9 2005/10/25 23:20:29 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -388,7 +388,7 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|b",
&zcallable, &do_throw) == FAILURE) {
return;
}
- if (!zend_is_callable_ex(zcallable, 0, &func_name,
&func_name_len, &alfi.func_ptr, &obj_ptr TSRMLS_CC)) {
+ if (!zend_is_callable_ex(zcallable, 0, &func_name,
&func_name_len, &alfi.ce, &alfi.func_ptr, &obj_ptr TSRMLS_CC)) {
if (do_throw) {
zend_throw_exception_ex(spl_ce_LogicException,
0 TSRMLS_CC, "Passed array does not specify a callable static method");
}
@@ -407,10 +407,8 @@
if (obj_ptr && !(alfi.func_ptr->common.fn_flags &
ZEND_ACC_STATIC)) {
alfi.obj = *obj_ptr;
alfi.obj->refcount++;
- alfi.ce = Z_OBJCE_P(alfi.obj);
} else {
alfi.obj = NULL;
- alfi.ce = NULL;
}
} else if (ZEND_NUM_ARGS()) {
lc_name = do_alloca(func_name_len + 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
