helly Tue Oct 25 15:38:58 2005 EDT Modified files: /php-src/ext/spl php_spl.c Log: - zend_is_callable_ex() was changed http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.69&r2=1.70&ty=u Index: php-src/ext/spl/php_spl.c diff -u php-src/ext/spl/php_spl.c:1.69 php-src/ext/spl/php_spl.c:1.70 --- php-src/ext/spl/php_spl.c:1.69 Mon Oct 10 19:58:40 2005 +++ php-src/ext/spl/php_spl.c Tue Oct 25 15:38:49 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_spl.c,v 1.69 2005/10/10 23:58:40 helly Exp $ */ +/* $Id: php_spl.c,v 1.70 2005/10/25 19:38:49 helly Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -392,7 +392,7 @@ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|b", &zcallable, &do_throw) == FAILURE) { return; } - if (!zend_is_callable_ex(zcallable, 0, &zfunc_name, &alfi.func_ptr, &obj_ptr TSRMLS_CC)) { + if (!zend_is_callable_ex(zcallable, 0, &zfunc_name, &alfi.ce, &alfi.func_ptr, &obj_ptr TSRMLS_CC)) { if (do_throw) { zend_throw_exception_ex(U_CLASS_ENTRY(spl_ce_LogicException), 0 TSRMLS_CC, "Passed array does not specify a callable static method"); } @@ -412,10 +412,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 = zend_u_str_tolower_dup(func_name_type, func_name, func_name_len);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php