]> granicus.if.org Git - php/commitdiff
- WS
authorPierre Joye <pajoye@php.net>
Sat, 5 Sep 2009 19:01:06 +0000 (19:01 +0000)
committerPierre Joye <pajoye@php.net>
Sat, 5 Sep 2009 19:01:06 +0000 (19:01 +0000)
Zend/zend_API.c

index 552d95390aed5e9cc69b450eeef346ad09e937e5..54d5f13ec2d805db5dbc78e138c4917862a38a12 100644 (file)
@@ -901,10 +901,10 @@ ZEND_API void zend_update_class_constants(zend_class_entry *class_type TSRMLS_DC
 
                                zend_hash_get_current_key_ex(&class_type->default_static_members, &str_index, &str_length, &num_index, 0, &pos);
                                if ((*p)->is_ref &&
-                                   class_type->parent &&
-                                   zend_hash_find(&class_type->parent->default_static_members, str_index, str_length, (void**)&q) == SUCCESS &&
-                                   *p == *q &&
-                                   zend_hash_find(CE_STATIC_MEMBERS(class_type->parent), str_index, str_length, (void**)&q) == SUCCESS) {
+                                       class_type->parent &&
+                                       zend_hash_find(&class_type->parent->default_static_members, str_index, str_length, (void**)&q) == SUCCESS &&
+                                       *p == *q &&
+                                       zend_hash_find(CE_STATIC_MEMBERS(class_type->parent), str_index, str_length, (void**)&q) == SUCCESS) {
                                        (*q)->refcount++;
                                        (*q)->is_ref = 1;
                                        zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)q, sizeof(zval*), NULL);