From 0aef71ff89f8968a8a1b2169f1f1b297ee867b1d Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Sun, 23 Mar 2003 08:14:41 +0000 Subject: [PATCH] Another fix for implicit public, perhaps it was not such a good idea :I --- Zend/zend_compile.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 77d469a676..f53aca28c4 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1698,6 +1698,13 @@ static zend_bool do_inherit_property_access_check(HashTable *target_ht, zend_pro if ((child_info->flags & ZEND_ACC_PPP_MASK) > (parent_info->flags & ZEND_ACC_PPP_MASK)) { zend_error(E_COMPILE_ERROR, "Access level to %s::$%s must be %s (as in class %s)%s", ce->name, hash_key->arKey, zend_visibility_string(parent_info->flags), parent_ce->name, (parent_info->flags&ZEND_ACC_PUBLIC) ? "" : " or weaker"); } else if (child_info->flags & ZEND_ACC_IMPLICIT_PUBLIC) { + /* Explicitly copy the value from the parent */ + zval **pvalue; + + if (zend_hash_quick_find(&parent_ce->default_properties, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void **) &pvalue)==SUCCESS) { + zend_hash_quick_update(&ce->default_properties, hash_key->arKey, hash_key->nKeyLength, hash_key->h, pvalue, sizeof(zval *), NULL); + (*pvalue)->refcount++; + } return 1; /* Inherit from the parent */ } return 0; /* Don't copy from parent */ -- 2.40.0