summaryrefslogtreecommitdiff
path: root/Zend/zend_inheritance.c
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2015-07-10 16:04:45 +0800
committerXinchen Hui <laruence@php.net>2015-07-10 16:04:45 +0800
commit54305c89522b7938a2e47080e189dac1ad665cd7 (patch)
treee777480d78cf47e0815611fb41472054a380744c /Zend/zend_inheritance.c
parenta3f05d640d73d61c1978446adb1217f40356d037 (diff)
downloadphp-git-54305c89522b7938a2e47080e189dac1ad665cd7.tar.gz
Fixed No 2 issue in #1400
Diffstat (limited to 'Zend/zend_inheritance.c')
-rw-r--r--Zend/zend_inheritance.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
index 9b96a4a479..4bd7eb9c76 100644
--- a/Zend/zend_inheritance.c
+++ b/Zend/zend_inheritance.c
@@ -837,6 +837,8 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent
ce->default_static_members_count += parent_ce->default_static_members_count;
if (ce->type == ZEND_USER_CLASS) {
ce->static_members_table = ce->default_static_members_table;
+ } else {
+ ce->ce_flags &= ~ZEND_ACC_CONSTANTS_UPDATED;
}
}