diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-04 18:03:45 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-04 18:03:45 +0400 |
| commit | 6bf24f4dd01331122a0f10db392c08605f159826 (patch) | |
| tree | 7fe575ead375355aab6c9b2c8a1593642d658406 /ext/spl/php_spl.c | |
| parent | d2890963e4540a20954afae0e059810312c9dc4e (diff) | |
| download | php-git-6bf24f4dd01331122a0f10db392c08605f159826.tar.gz | |
Removed EG(active_symbol_table) and use corresponding value from EG(current_execute_data)
Diffstat (limited to 'ext/spl/php_spl.c')
| -rw-r--r-- | ext/spl/php_spl.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index 3730adc699..e5f968e26b 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -286,14 +286,11 @@ static int spl_autoload(zend_string *class_name, zend_string *lc_name, const cha } STR_RELEASE(opened_path); if (new_op_array) { - if (!EG(active_symbol_table)) { - zend_rebuild_symbol_table(TSRMLS_C); - } - ZVAL_UNDEF(&result); if (EG(current_execute_data)) { EG(current_execute_data)->call = zend_vm_stack_push_call_frame( (zend_function*)new_op_array, 0, 0, EG(current_execute_data)->called_scope, Z_OBJ(EG(This)), EG(current_execute_data)->call TSRMLS_CC); + EG(current_execute_data)->call->symbol_table = zend_rebuild_symbol_table(TSRMLS_C); } zend_execute(new_op_array, &result TSRMLS_CC); |