diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-05-27 12:12:12 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-05-27 12:12:12 +0800 |
| commit | 1838f965bc132ac4e7eea666d07c7eb0df7c9cc8 (patch) | |
| tree | df3a63e04dcdf91e6a59138475ac55ef01e9edf6 | |
| parent | 63ca6f93a15ce3553edb0a29719811c7a0578026 (diff) | |
| parent | ece7d223e821f57593e7c005a83500f6b491d723 (diff) | |
| download | php-git-1838f965bc132ac4e7eea666d07c7eb0df7c9cc8.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Correct the location
| -rw-r--r-- | Zend/zend_API.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 323e10160d..8d5ef2b0b9 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1156,10 +1156,9 @@ ZEND_API int zend_update_class_constants(zend_class_entry *class_type) /* {{{ */ ce = ce->parent; } } + class_type->ce_flags |= ZEND_ACC_CONSTANTS_UPDATED; } - class_type->ce_flags |= ZEND_ACC_CONSTANTS_UPDATED; - return SUCCESS; } /* }}} */ |