summaryrefslogtreecommitdiff
path: root/Zend/zend_object_handlers.c
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2003-09-03 16:13:40 +0000
committerMarcus Boerger <helly@php.net>2003-09-03 16:13:40 +0000
commit1b39a5aa2c97c679f1ffdaa8baa388d506e9aea7 (patch)
tree8f236f5ee5bf005bb12e2c937b5c6bbce6a0624c /Zend/zend_object_handlers.c
parent804312c4a1de337987bd5fde12c8813d0f2a1049 (diff)
downloadphp-git-1b39a5aa2c97c679f1ffdaa8baa388d506e9aea7.tar.gz
Fix static properties.
# # There's only an errormessage missing which i'll wommit as soon as i find out # how to do it best. But besides that damn message everything works now and all # inheritance rules apply. #
Diffstat (limited to 'Zend/zend_object_handlers.c')
-rw-r--r--Zend/zend_object_handlers.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index a5914cbad9..3892918bf5 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -726,12 +726,7 @@ zval **zend_std_get_static_property(zend_class_entry *ce, char *property_name, i
zend_error(E_ERROR, "Cannot access %s property %s::$%s", zend_visibility_string(property_info->flags), ce->name, property_name);
}
- while (tmp_ce) {
- if (zend_hash_quick_find(tmp_ce->static_members, property_info->name, property_info->name_length+1, property_info->h, (void **) &retval)==SUCCESS) {
- break;
- }
- tmp_ce = tmp_ce->parent;
- }
+ zend_hash_quick_find(tmp_ce->static_members, property_info->name, property_info->name_length+1, property_info->h, (void **) &retval);
if (!retval) {
if (silent) {
@@ -741,7 +736,6 @@ zval **zend_std_get_static_property(zend_class_entry *ce, char *property_name, i
}
}
- zval_update_constant(retval, (void *) 1 TSRMLS_CC);
return retval;
}