diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-05-03 19:55:41 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-05-03 19:55:41 +0100 |
| commit | 34a9882ad357620ccec2bfadba72fce027acd3d6 (patch) | |
| tree | d531877fdae8ec4126e8042ca350dcfcdb8b770f /sapi/phpdbg/phpdbg_print.c | |
| parent | 93b67dd511fdf890931e2b18846886368798ca5a (diff) | |
| parent | ee551106bc11d6ac2eb277b810c9b8bb90e318bc (diff) | |
| download | php-git-34a9882ad357620ccec2bfadba72fce027acd3d6.tar.gz | |
Merge branch 'master' into json_parser_method
Diffstat (limited to 'sapi/phpdbg/phpdbg_print.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_print.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sapi/phpdbg/phpdbg_print.c b/sapi/phpdbg/phpdbg_print.c index 3725bf6083..034354a9e7 100644 --- a/sapi/phpdbg/phpdbg_print.c +++ b/sapi/phpdbg/phpdbg_print.c @@ -217,11 +217,13 @@ PHPDBG_PRINT(func) /* {{{ */ zend_string *lcname; /* search active scope if begins with period */ if (func_name[0] == '.') { - if (EG(scope)) { + zend_class_entry *scope = zend_get_executed_scope(); + + if (scope) { func_name++; func_name_len--; - func_table = &EG(scope)->function_table; + func_table = &scope->function_table; } else { phpdbg_error("inactive", "type=\"noclasses\"", "No active class"); return SUCCESS; |