php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-12 02:23:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed $this handling

Browse Source
This commit is contained in:
Dmitry Stogov
2014-02-24 17:07:44 +04:00
parent a3448b7cfa
commit 55bca5868a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Zend/zend_execute.c
View File

@@ -1654,12 +1654,12 @@ static zend_always_inline zend_execute_data *i_create_execute_data_from_op_array
if (op_array->this_var != -1 && Z_TYPE(EG(This)) != IS_UNDEF) {
if (!EG(active_symbol_table)) {
ZVAL_COPY(EX_VAR(op_array->this_var), &EG(This));
ZVAL_COPY(EX_VAR_NUM(op_array->this_var), &EG(This));
} else {
ZVAL_COPY(EX_VAR(op_array->this_var), &EG(This));
ZVAL_COPY(EX_VAR_NUM(op_array->this_var), &EG(This));
zval *zv = zend_hash_str_add(EG(active_symbol_table), "this", sizeof("this")-1, EX_VAR(op_array->this_var));
if (zv) {
Z_ADDREF(EG(This));
ZVAL_INDIRECT(EX_VAR_NUM(op_array->this_var), zv);
}
}
}