diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-03 02:34:43 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-03 02:34:43 +0400 |
| commit | c4d99ec982e214d05b398694dc76a9caac16fbd1 (patch) | |
| tree | ec5c9a08f9100325b1f3811ff71ad8c84ccbc07a /Zend/zend_interfaces.c | |
| parent | 0a77dcd4b9046adb7c8f719ded19c5eff0c8976a (diff) | |
| download | php-git-c4d99ec982e214d05b398694dc76a9caac16fbd1.tar.gz | |
Removed EG(called_scope) and use corresponding value from EG(current_execute_data)
Diffstat (limited to 'Zend/zend_interfaces.c')
| -rw-r--r-- | Zend/zend_interfaces.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c index ded81e2918..d5420dae76 100644 --- a/Zend/zend_interfaces.c +++ b/Zend/zend_interfaces.c @@ -90,11 +90,12 @@ ZEND_API zval* zend_call_method(zval *object, zend_class_entry *obj_ce, zend_fun if (object) { fcic.called_scope = Z_OBJCE_P(object); } else if (obj_ce && - !(EG(called_scope) && - instanceof_function(EG(called_scope), obj_ce TSRMLS_CC))) { + !(EG(current_execute_data) && + EG(current_execute_data)->called_scope && + instanceof_function(EG(current_execute_data)->called_scope, obj_ce TSRMLS_CC))) { fcic.called_scope = obj_ce; } else { - fcic.called_scope = EG(called_scope); + fcic.called_scope = EG(current_execute_data) ? EG(current_execute_data)->called_scope : NULL; } fcic.object = object ? Z_OBJ_P(object) : NULL; result = zend_call_function(&fci, &fcic TSRMLS_CC); |