16 lines
931 B
Diff
16 lines
931 B
Diff
X-Git-Url: http://git.php.net/?p=php-src.git;a=blobdiff_plain;f=Zend%2Fzend_API.c;h=439d80913f013a9891a9b67b6f565105f479bca6;hp=56c7c245b53e416dd5d5bd36b3ffb71c5a560f2f;hb=ecd9d7625098bfc0a14ffa1fc39535848e71fc80;hpb=9da4985bf2d532ed72fbd3a7d3390464692cce7a
|
|
|
|
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
|
|
index 56c7c24..439d809 100644
|
|
--- a/Zend/zend_API.c
|
|
+++ b/Zend/zend_API.c
|
|
@@ -2842,7 +2842,7 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca
|
|
}
|
|
if ((check_flags & IS_CALLABLE_CHECK_NO_ACCESS) == 0 &&
|
|
(fcc->calling_scope &&
|
|
- (fcc->calling_scope->__call ||
|
|
+ ((fcc->calling_scope->__call && fcc->object_ptr) ||
|
|
fcc->calling_scope->__callstatic))) {
|
|
if (fcc->function_handler->op_array.fn_flags & ZEND_ACC_PRIVATE) {
|
|
if (!zend_check_private(fcc->function_handler, fcc->object_ptr ? Z_OBJCE_P(fcc->object_ptr) : EG(scope), lmname, mlen TSRMLS_CC)) {
|
