diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-11-29 01:45:54 +0000 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-11-29 01:45:54 +0000 |
| commit | 01554bf3e417f13baf7af874e449c265c0309279 (patch) | |
| tree | 8aca46ab27a54cea34c14001af774942f0502e39 /sapi/phpdbg/phpdbg_frame.c | |
| parent | 65c8edd525108f6598a8bb25fb3c5d6c80233322 (diff) | |
| parent | 719083bd943e6c287c2dcb47918cf51f89a4ac08 (diff) | |
| download | php-git-01554bf3e417f13baf7af874e449c265c0309279.tar.gz | |
Merge branch 'master' into zppFailOnOverflow
Diffstat (limited to 'sapi/phpdbg/phpdbg_frame.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_frame.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/phpdbg/phpdbg_frame.c b/sapi/phpdbg/phpdbg_frame.c index f42fc659f1..c9ba377d95 100644 --- a/sapi/phpdbg/phpdbg_frame.c +++ b/sapi/phpdbg/phpdbg_frame.c @@ -37,7 +37,7 @@ void phpdbg_restore_frame(TSRMLS_D) /* {{{ */ /* move things back */ EG(current_execute_data) = PHPDBG_FRAME(execute_data); - EG(scope) = PHPDBG_EX(scope); + EG(scope) = PHPDBG_EX(func)->op_array.scope; } /* }}} */ void phpdbg_switch_frame(int frame TSRMLS_DC) /* {{{ */ @@ -79,7 +79,7 @@ void phpdbg_switch_frame(int frame TSRMLS_DC) /* {{{ */ PHPDBG_FRAME(execute_data) = EG(current_execute_data); EG(current_execute_data) = execute_data; - EG(scope) = PHPDBG_EX(scope); + EG(scope) = PHPDBG_EX(func)->op_array.scope; } phpdbg_notice("frame", "id=\"%d\"", "Switched to frame #%d", frame); |