summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2009-09-05 19:01:06 +0000
committerPierre Joye <pajoye@php.net>2009-09-05 19:01:06 +0000
commit98c32cf3b02073503cc4590a1473be700e62d140 (patch)
tree19f1cf85bceb44e8d6f20a4bb4e65369daf2ad3e
parentac40eed89dc0dbe00d83f61e5ae78a7cb75a13cb (diff)
downloadphp-git-98c32cf3b02073503cc4590a1473be700e62d140.tar.gz
- WS
-rw-r--r--Zend/zend_API.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 552d95390a..54d5f13ec2 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -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);