summaryrefslogtreecommitdiff
path: root/Zend/zend_object_handlers.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2019-06-24 20:32:27 +0300
committerDmitry Stogov <dmitry@zend.com>2019-06-24 20:32:27 +0300
commit0f29fb5cd81d9df4829bc63f704019df910b3075 (patch)
tree05c34dda76c2e45630d5fe9528d10dc5fef97bd3 /Zend/zend_object_handlers.c
parent94df6dc3fd07fa187ba09c587a8d1357fd8bbe6f (diff)
downloadphp-git-0f29fb5cd81d9df4829bc63f704019df910b3075.tar.gz
Fixed bug 78175 (Preloading must store default values of static variables and properties)
Diffstat (limited to 'Zend/zend_object_handlers.c')
-rw-r--r--Zend/zend_object_handlers.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 10f5ac1524..3f8be6f707 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -1491,7 +1491,7 @@ ZEND_API zval *zend_std_get_static_property_with_info(zend_class_entry *ce, zend
/* check if static properties were destroyed */
if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
- if (ce->type == ZEND_INTERNAL_CLASS || (ce->ce_flags & ZEND_ACC_IMMUTABLE)) {
+ if (ce->type == ZEND_INTERNAL_CLASS || (ce->ce_flags & (ZEND_ACC_IMMUTABLE|ZEND_ACC_PRELOADED))) {
zend_class_init_statics(ce);
} else {
undeclared_property: