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/mbstring/mbstring.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/mbstring/mbstring.c')
| -rw-r--r-- | ext/mbstring/mbstring.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index ebea66323c..df264e02af 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -2084,10 +2084,9 @@ PHP_FUNCTION(mb_parse_str) detected = _php_mb_encoding_handler_ex(&info, track_vars_array, encstr TSRMLS_CC); } else { zval tmp; - if (!EG(active_symbol_table)) { - zend_rebuild_symbol_table(TSRMLS_C); - } - ZVAL_ARR(&tmp, EG(active_symbol_table)); + zend_array *symbol_table = zend_rebuild_symbol_table(TSRMLS_C); + + ZVAL_ARR(&tmp, symbol_table); detected = _php_mb_encoding_handler_ex(&info, &tmp, encstr TSRMLS_CC); } |