diff options
| author | Marcus Boerger <helly@php.net> | 2005-10-25 23:20:29 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2005-10-25 23:20:29 +0000 |
| commit | 936b1e56c36b8e40973f4b89b1e636e511bcc375 (patch) | |
| tree | 668cf6f3ce34788d562e5120e613b7b9c5053149 | |
| parent | 2486b846ccdb070476f506477d8b5caafe3d505f (diff) | |
| download | php-git-936b1e56c36b8e40973f4b89b1e636e511bcc375.tar.gz | |
- MFH zend_is_callable_ex() has been changed
| -rwxr-xr-x | ext/spl/php_spl.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index c5f8db9037..342c1d0086 100755 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -388,7 +388,7 @@ PHP_FUNCTION(spl_autoload_register) 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 @@ PHP_FUNCTION(spl_autoload_register) 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); |