summaryrefslogtreecommitdiff
path: root/Zend/zend_API.c
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2009-07-15 01:11:24 +0000
committerFelipe Pena <felipe@php.net>2009-07-15 01:11:24 +0000
commitbffd08072c607807ef6215920152ff223c5ee620 (patch)
tree555f893a9ecc339880ab68fd391240416020e2b9 /Zend/zend_API.c
parent912131b304b0caebd3908df1871c7e971ad4556b (diff)
downloadphp-git-bffd08072c607807ef6215920152ff223c5ee620.tar.gz
- MFH: Fixed bug #48899 (is_callable returns true even if method does not exist in parent class)
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 d4c1036a74..bb263fab6c 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2519,7 +2519,7 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca
}
} else {
get_function_via_handler:
- if (fcc->object_ptr) {
+ if (fcc->object_ptr && fcc->calling_scope == ce_org) {
if (Z_OBJ_HT_P(fcc->object_ptr)->get_method) {
fcc->function_handler = Z_OBJ_HT_P(fcc->object_ptr)->get_method(&fcc->object_ptr, mname, mlen TSRMLS_CC);
if (fcc->function_handler) {