com php-src: fix phpdbg, _zend_execute_data.scope was removed with 9a36cb1a07c247766 278a888612ecbac812bece9: sapi/php dbg/phpdbg_frame.c
| From: | Ferenc Kovacs | Date: | Fri, 28 Nov 2014 21:12:02 +0000 |
| Subject: | com php-src: fix phpdbg, _zend_execute_data.scope was removed with 9a36cb1a07c247766 278a888612ecbac812bece9: sapi/php dbg/phpdbg_frame.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83377@lists.php.net to get a copy of this message | ||
Commit: 82979862ba67fcc3f26c98f9712f6b9c9188ad02
Author: Ferenc Kovacs <tyrael@php.net> Fri, 28 Nov 2014 22:12:02 +0100
Parents: 2d39d033e3a757e452f28f213d55c40c7aa64bfb
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=82979862ba67fcc3f26c98f9712f6b9c9188ad02
Log:
fix phpdbg, _zend_execute_data.scope was removed with 9a36cb1a07c247766278a888612ecbac812bece9
Changed paths:
M sapi/phpdbg/phpdbg_frame.c
Diff:
diff --git a/sapi/phpdbg/phpdbg_frame.c b/sapi/phpdbg/phpdbg_frame.c
index f42fc65..c9ba377 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);