diff options
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 4fee752df9..4f9f4f9b46 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1087,8 +1087,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; @@ -1163,6 +1161,9 @@ ZEND_API int zend_update_class_constants(zend_class_entry *class_type) /* {{{ */ *scope = old_scope; } } + + class_type->ce_flags |= ZEND_ACC_CONSTANTS_UPDATED; + return SUCCESS; } /* }}} */ |