diff options
| author | Marcus Boerger <helly@php.net> | 2006-07-10 00:36:28 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2006-07-10 00:36:28 +0000 |
| commit | 704eced26b361c6ac9a9e04700cb46d27da6b16f (patch) | |
| tree | 658f49a2bcc206a518f2007acddca8a0014939ee /Zend/zend_execute.c | |
| parent | 71efa5b435f032b3a88204d8771b4f83869bec26 (diff) | |
| download | php-git-704eced26b361c6ac9a9e04700cb46d27da6b16f.tar.gz | |
- MFH Fixed Bug #37667 (Object is not added into array returned by __get)
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 99fb7ac7ad..9a05235f14 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -946,6 +946,7 @@ static inline zval **zend_fetch_dimension_address_inner(HashTable *ht, zval *dim offset_key = ""; offset_key_length = 0; goto fetch_string_dim; + case IS_STRING: offset_key = dim->value.str.val; @@ -1266,7 +1267,7 @@ static void zend_fetch_property_address(temp_variable *result, zval **container_ zval *ptr; if (Z_OBJ_HT_P(container)->read_property && - (ptr = Z_OBJ_HT_P(container)->read_property(container, prop_ptr, BP_VAR_W TSRMLS_CC)) != NULL) { + (ptr = Z_OBJ_HT_P(container)->read_property(container, prop_ptr, type TSRMLS_CC)) != NULL) { if (result) { result->var.ptr = ptr; result->var.ptr_ptr = &result->var.ptr; @@ -1279,7 +1280,7 @@ static void zend_fetch_property_address(temp_variable *result, zval **container_ } } else if (Z_OBJ_HT_P(container)->read_property) { if (result) { - result->var.ptr = Z_OBJ_HT_P(container)->read_property(container, prop_ptr, BP_VAR_W TSRMLS_CC); + result->var.ptr = Z_OBJ_HT_P(container)->read_property(container, prop_ptr, type TSRMLS_CC); result->var.ptr_ptr = &result->var.ptr; } } else { |