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/readline/readline_cli.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/readline/readline_cli.c')
| -rw-r--r-- | ext/readline/readline_cli.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/readline/readline_cli.c b/ext/readline/readline_cli.c index c94c245071..84d27ca046 100644 --- a/ext/readline/readline_cli.c +++ b/ext/readline/readline_cli.c @@ -432,8 +432,9 @@ static char *cli_completion_generator_ht(const char *text, int textlen, int *sta static char *cli_completion_generator_var(const char *text, int textlen, int *state TSRMLS_DC) /* {{{ */ { char *retval, *tmp; + zend_array *symbol_table = zend_rebuild_symbol_table(TSRMLS_C); - tmp = retval = cli_completion_generator_ht(text + 1, textlen - 1, state, EG(active_symbol_table) ? &EG(active_symbol_table)->ht : NULL, NULL TSRMLS_CC); + tmp = retval = cli_completion_generator_ht(text + 1, textlen - 1, state, symbol_table ? &symbol_table->ht : NULL, NULL TSRMLS_CC); if (retval) { retval = malloc(strlen(tmp) + 2); retval[0] = '$'; |