summaryrefslogtreecommitdiff
path: root/Zend/zend_builtin_functions.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-07-04 18:03:45 +0400
committerDmitry Stogov <dmitry@zend.com>2014-07-04 18:03:45 +0400
commit6bf24f4dd01331122a0f10db392c08605f159826 (patch)
tree7fe575ead375355aab6c9b2c8a1593642d658406 /Zend/zend_builtin_functions.c
parentd2890963e4540a20954afae0e059810312c9dc4e (diff)
downloadphp-git-6bf24f4dd01331122a0f10db392c08605f159826.tar.gz
Removed EG(active_symbol_table) and use corresponding value from EG(current_execute_data)
Diffstat (limited to 'Zend/zend_builtin_functions.c')
-rw-r--r--Zend/zend_builtin_functions.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index a9b7a6c12b..dbe02ded5c 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -1749,12 +1749,10 @@ ZEND_FUNCTION(get_defined_functions)
Returns an associative array of names and values of all currently defined variable names (variables in the current scope) */
ZEND_FUNCTION(get_defined_vars)
{
- if (!EG(active_symbol_table)) {
- zend_rebuild_symbol_table(TSRMLS_C);
- }
+ zend_array *symbol_table = zend_rebuild_symbol_table(TSRMLS_C);
ZVAL_NEW_ARR(return_value);
- zend_array_dup(Z_ARRVAL_P(return_value), &EG(active_symbol_table)->ht);
+ zend_array_dup(Z_ARRVAL_P(return_value), &symbol_table->ht);
}
/* }}} */