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_constants.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_constants.c')
| -rw-r--r-- | Zend/zend_constants.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index 4930d1fdd4..5366845519 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -231,7 +231,7 @@ static zend_constant *zend_get_special_constant(const char *name, uint name_len zend_constant *c; static char haltoff[] = "__COMPILER_HALT_OFFSET__"; - if (!EG(in_execution)) { + if (!EG(current_execute_data)) { return NULL; } else if (name_len == sizeof("__CLASS__")-1 && !memcmp(name, "__CLASS__", sizeof("__CLASS__")-1)) { @@ -354,7 +354,7 @@ ZEND_API zval *zend_get_constant_ex(zend_string *cname, zend_class_entry *scope, lcname = do_alloca(class_name_len + 1, use_heap); zend_str_tolower_copy(lcname, name, class_name_len); if (!scope) { - if (EG(in_execution)) { + if (EG(current_execute_data)) { scope = EG(scope); } else { scope = CG(active_class_entry); |