diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-04-28 04:13:34 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-04-28 04:13:34 +0300 |
| commit | 6499162ff0d8aa6e862d3e3cdd2288b87636b8a1 (patch) | |
| tree | b1de28564ceb5249bd207a6291fff0ab3dac877f /sapi/phpdbg/phpdbg_print.c | |
| parent | 8339222106ac38090e9790f1abbbe2c70c1840fd (diff) | |
| download | php-git-6499162ff0d8aa6e862d3e3cdd2288b87636b8a1.tar.gz | |
- get rid of EG(scope). zend_get_executed_scope() should be used instead.
- ichanged zval_update_constant_ex(). Use IS_TYPE_IMMUTABLE flag on shared constants and AST, instead of "inline_change" parameter.
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; |