diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-03 02:34:43 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-03 02:34:43 +0400 |
| commit | c4d99ec982e214d05b398694dc76a9caac16fbd1 (patch) | |
| tree | ec5c9a08f9100325b1f3811ff71ad8c84ccbc07a /Zend/zend_constants.c | |
| parent | 0a77dcd4b9046adb7c8f719ded19c5eff0c8976a (diff) | |
| download | php-git-c4d99ec982e214d05b398694dc76a9caac16fbd1.tar.gz | |
Removed EG(called_scope) and use corresponding value from EG(current_execute_data)
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 5366845519..650a566159 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -379,8 +379,8 @@ ZEND_API zval *zend_get_constant_ex(zend_string *cname, zend_class_entry *scope, } } else if (class_name_len == sizeof("static")-1 && !memcmp(lcname, "static", sizeof("static")-1)) { - if (EG(called_scope)) { - ce = EG(called_scope); + if (EG(current_execute_data) && EG(current_execute_data)->called_scope) { + ce = EG(current_execute_data)->called_scope; } else { zend_error(E_ERROR, "Cannot access static:: when no class scope is active"); } |