diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-05-27 12:09:28 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-05-27 12:09:28 +0800 |
| commit | 8af21f3ca67042e606ca09a354041b38ca1ad5e5 (patch) | |
| tree | 2a8b59de5d84402f5d295abe4f8d1318f161d79a /Zend/zend_API.c | |
| parent | 7b5ba8e68b55dfdbce4cb7fae2b8d9c8a27e94d1 (diff) | |
| parent | 63ca6f93a15ce3553edb0a29719811c7a0578026 (diff) | |
| download | php-git-8af21f3ca67042e606ca09a354041b38ca1ad5e5.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
Added NEWs
Fixed bug #74657 (Undefined constants in array properties result in broken properties)
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index c95d462872..78985a777a 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1118,8 +1118,6 @@ ZEND_API void zend_merge_properties(zval *obj, HashTable *properties) /* {{{ */ ZEND_API int zend_update_class_constants(zend_class_entry *class_type) /* {{{ */ { if (!(class_type->ce_flags & ZEND_ACC_CONSTANTS_UPDATED)) { - class_type->ce_flags |= ZEND_ACC_CONSTANTS_UPDATED; - if (class_type->parent) { if (UNEXPECTED(zend_update_class_constants(class_type->parent) != SUCCESS)) { return FAILURE; @@ -1189,6 +1187,9 @@ ZEND_API int zend_update_class_constants(zend_class_entry *class_type) /* {{{ */ } } } + + class_type->ce_flags |= ZEND_ACC_CONSTANTS_UPDATED; + return SUCCESS; } /* }}} */ |