diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-02 22:03:21 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-02 22:03:21 +0400 |
| commit | 4b09dd69e6bd31f4010bf48e9e07e63cb5f3c2a4 (patch) | |
| tree | ba61f22f1d9c12700d288bebe62a5cab3b6cb77a /Zend/zend_API.c | |
| parent | 412ad4b25417d261c0a8c43f788d5c110593d891 (diff) | |
| download | php-git-4b09dd69e6bd31f4010bf48e9e07e63cb5f3c2a4.tar.gz | |
Removed EG(active_op_array) and use corresponding value from EG(current_execute_data)
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index a1b9083629..3a96574fcc 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2806,8 +2806,13 @@ static int zend_is_callable_check_class(zend_string *name, zend_fcall_info_cache ret = 1; } } else if ((ce = zend_lookup_class_ex(name, NULL, 1 TSRMLS_CC)) != NULL) { - zend_class_entry *scope = EG(active_op_array) ? EG(active_op_array)->scope : NULL; + zend_class_entry *scope; + zend_execute_data *ex = EG(current_execute_data); + while (ex && (!ex->func || !ZEND_USER_CODE(ex->func->type))) { + ex = ex->prev_execute_data; + } + scope = ex ? ex->func->common.scope : NULL; fcc->calling_scope = ce; if (scope && !fcc->object && Z_OBJ(EG(This)) && instanceof_function(Z_OBJCE(EG(This)), scope TSRMLS_CC) && |