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_vm_execute.skl | |
| 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_vm_execute.skl')
| -rw-r--r-- | Zend/zend_vm_execute.skl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_vm_execute.skl b/Zend/zend_vm_execute.skl index 656c0fcd9e..ae5bac4db3 100644 --- a/Zend/zend_vm_execute.skl +++ b/Zend/zend_vm_execute.skl @@ -39,7 +39,7 @@ ZEND_API void zend_{%EXECUTOR_NAME%}(zend_op_array *op_array, zval *return_value execute_data = EG(current_execute_data)->call; } else { execute_data = zend_vm_stack_push_call_frame( - (zend_function*)op_array, 0, 0, EG(called_scope), Z_OBJ(EG(This)), NULL TSRMLS_CC); + (zend_function*)op_array, 0, 0, EG(current_execute_data) ? EG(current_execute_data)->called_scope : NULL, Z_OBJ(EG(This)), NULL TSRMLS_CC); } EX(prev_execute_data) = EG(current_execute_data); i_init_execute_data(execute_data, op_array, return_value, EG(active_symbol_table) ? VM_FRAME_TOP_CODE : VM_FRAME_TOP_FUNCTION TSRMLS_CC); |