diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-03 01:02:25 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-03 01:02:25 +0400 |
| commit | 0a77dcd4b9046adb7c8f719ded19c5eff0c8976a (patch) | |
| tree | 8fdd3343db9b3a7345ded20de1b20da68bcc1705 /Zend/zend_API.c | |
| parent | 63c057e3313918a800ad7faebdb648216ddba4c0 (diff) | |
| download | php-git-0a77dcd4b9046adb7c8f719ded19c5eff0c8976a.tar.gz | |
Removed EG(in_execution). If EG(currentent_execute_data) is not NULL we are executing something.
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 36b615ba1b..6474fd6ad7 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1072,7 +1072,7 @@ static int zval_update_class_constant(zval *pp, int is_static, int offset TSRMLS { ZVAL_DEREF(pp); if (Z_CONSTANT_P(pp)) { - zend_class_entry **scope = EG(in_execution)?&EG(scope):&CG(active_class_entry); + zend_class_entry **scope = EG(current_execute_data) ? &EG(scope) : &CG(active_class_entry); if ((*scope)->parent) { zend_class_entry *ce = *scope; @@ -1136,7 +1136,7 @@ ZEND_API void zend_update_class_constants(zend_class_entry *class_type TSRMLS_DC } if ((class_type->ce_flags & ZEND_ACC_CONSTANTS_UPDATED) == 0) { - zend_class_entry **scope = EG(in_execution)?&EG(scope):&CG(active_class_entry); + zend_class_entry **scope = EG(current_execute_data) ? &EG(scope) : &CG(active_class_entry); zend_class_entry *old_scope = *scope; zval *val; |