com php-src: Fixed No 2 issue in #1400: Zend/zend_inheritance .c
| From: | Xinchen Hui | Date: | Fri, 10 Jul 2015 08:04:45 +0000 |
| Subject: | com php-src: Fixed No 2 issue in #1400: Zend/zend_inheritance .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87899@lists.php.net to get a copy of this message | ||
Commit: 54305c89522b7938a2e47080e189dac1ad665cd7
Author: Xinchen Hui <laruence@php.net> Fri, 10 Jul 2015 16:04:45 +0800
Parents: a3f05d640d73d61c1978446adb1217f40356d037
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=54305c89522b7938a2e47080e189dac1ad665cd7
Log:
Fixed No 2 issue in #1400
Bugs:
https://bugs.php.net/1400
Changed paths:
M Zend/zend_inheritance.c
Diff:
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
index 9b96a4a..4bd7eb9 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;
}
}