diff options
| author | Xinchen Hui <laruence@php.net> | 2013-06-24 23:49:30 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-06-24 23:49:30 +0800 |
| commit | a6a3aa5d4930bd5134cc5f16e0c931c4a532b1da (patch) | |
| tree | 5fc2b12f782d5ff93fca7b60f4ec0d3d00500138 /Zend/zend_API.c | |
| parent | ecd9d7625098bfc0a14ffa1fc39535848e71fc80 (diff) | |
| parent | 9cf3e65391d6aa637e5471449499e957cff6ee89 (diff) | |
| download | php-git-a6a3aa5d4930bd5134cc5f16e0c931c4a532b1da.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
Zend/zend_API.c
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 439d80913f..23ad158b17 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2842,8 +2842,8 @@ 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->object_ptr) || - fcc->calling_scope->__callstatic))) { + ((fcc->object_ptr && 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)) { retval = 0; |