summaryrefslogtreecommitdiff
path: root/Zend/zend_API.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2012-11-20 12:51:55 +0400
committerDmitry Stogov <dmitry@zend.com>2012-11-20 12:51:55 +0400
commit396c1e990a0e513cf2e8510e9b6f82ab425c9e3a (patch)
tree14053627cff9dd623625c3540d37cefb9a2e3b7a /Zend/zend_API.c
parentd412152f31f145bf07b243465cdffa84ceba70be (diff)
downloadphp-git-396c1e990a0e513cf2e8510e9b6f82ab425c9e3a.tar.gz
Fixed bug #63468 (wrong called method as callback with inheritance)
Diffstat (limited to 'Zend/zend_API.c')
-rw-r--r--Zend/zend_API.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index d529775764..c1b501b0b7 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2520,7 +2520,7 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca
} else if (zend_hash_find(ftable, lmname, mlen+1, (void**)&fcc->function_handler) == SUCCESS) {
retval = 1;
if ((fcc->function_handler->op_array.fn_flags & ZEND_ACC_CHANGED) &&
- EG(scope) &&
+ !strict_class && EG(scope) &&
instanceof_function(fcc->function_handler->common.scope, EG(scope) TSRMLS_CC)) {
zend_function *priv_fbc;