On 14.09.2005 15:20, Zeev Suraski wrote:
Any last minute additions to 5.1.0RC2 or can we roll it?

It seems that #27145 has crept back into 5.1 with a copy/paste typo.
Here is the patch for it too.

--
Wbr, Antony Dovgal
Index: Zend/zend_compile.c
===================================================================
RCS file: /repository/ZendEngine2/zend_compile.c,v
retrieving revision 1.647.2.4
diff -u -p -d -r1.647.2.4 zend_compile.c
--- Zend/zend_compile.c 9 Sep 2005 06:48:47 -0000       1.647.2.4
+++ Zend/zend_compile.c 15 Sep 2005 14:53:39 -0000
@@ -2062,7 +2062,7 @@ static zend_bool do_inherit_property_acc
                                }
                                if (zend_hash_find(ht, prot_name, 
prot_name_length+1, (void**)&prop) == SUCCESS) {
                                        zval **new_prop;
-                                       if (zend_hash_find(ht, 
child_info->name, child_info->name_length+1, (void**)&new_prop) == SUCCESS) {
+                                       if (zend_hash_find(ce->static_members, 
child_info->name, child_info->name_length+1, (void**)&new_prop) == SUCCESS) {
                                                if (Z_TYPE_PP(new_prop) != 
IS_NULL && Z_TYPE_PP(prop) != IS_NULL) {
                                                        char *prop_name, *tmp;
                                                        
zend_unmangle_property_name(child_info->name, &tmp, &prop_name);

-- 
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to