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 /ext/standard/basic_functions.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 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 5fe17c88fb..644e364f21 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -4765,9 +4765,9 @@ PHP_FUNCTION(forward_static_call) fci.retval = &retval; - if (EG(called_scope) && - instanceof_function(EG(called_scope), fci_cache.calling_scope TSRMLS_CC)) { - fci_cache.called_scope = EG(called_scope); + if (EG(current_execute_data)->called_scope && + instanceof_function(EG(current_execute_data)->called_scope, fci_cache.calling_scope TSRMLS_CC)) { + fci_cache.called_scope = EG(current_execute_data)->called_scope; } if (zend_call_function(&fci, &fci_cache TSRMLS_CC) == SUCCESS && Z_TYPE(retval) != IS_UNDEF) { @@ -4791,9 +4791,9 @@ PHP_FUNCTION(forward_static_call_array) zend_fcall_info_args(&fci, params TSRMLS_CC); fci.retval = &retval; - if (EG(called_scope) && - instanceof_function(EG(called_scope), fci_cache.calling_scope TSRMLS_CC)) { - fci_cache.called_scope = EG(called_scope); + if (EG(current_execute_data)->called_scope && + instanceof_function(EG(current_execute_data)->called_scope, fci_cache.calling_scope TSRMLS_CC)) { + fci_cache.called_scope = EG(current_execute_data)->called_scope; } if (zend_call_function(&fci, &fci_cache TSRMLS_CC) == SUCCESS && Z_TYPE(retval) != IS_UNDEF) { |