- zend_is_callable_ex() was changed

diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index 4d3f4fd31b5d6794781049ea1a551013f06c0453..46e19bb8b07529c05f239ae87cc33901fbb711fa 100755 (executable)
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
@@ -392,7 +392,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, &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 @@ 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 = zend_u_str_tolower_dup(func_name_type, func_name, func_name_len);