summaryrefslogtreecommitdiff
path: root/Zend/zend_API.c
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2003-09-04 16:00:01 +0000
committerMarcus Boerger <helly@php.net>2003-09-04 16:00:01 +0000
commit95649ab260fa435ae7950b224ee0f6359ea37a68 (patch)
treeb35c00c923779b459525d44e16e36a3b5c065143 /Zend/zend_API.c
parent4e7a782f3a0a6169af249da03c290d27ba046391 (diff)
downloadphp-git-95649ab260fa435ae7950b224ee0f6359ea37a68.tar.gz
Tests show updating consts must happen once at runtime (revert optimization).
Add tests for static properties.
Diffstat (limited to 'Zend/zend_API.c')
-rw-r--r--Zend/zend_API.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index e95be0838c..136f48a022 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -700,6 +700,7 @@ ZEND_API int _object_and_properties_init(zval *arg, zend_class_entry *class_type
if (!class_type->constants_updated) {
zend_hash_apply_with_argument(&class_type->default_properties, (apply_func_arg_t) zval_update_constant, (void *) 1 TSRMLS_CC);
+ zend_hash_apply_with_argument(class_type->static_members, (apply_func_arg_t) zval_update_constant, (void *) 1 TSRMLS_CC);
class_type->constants_updated = 1;
}
@@ -1683,8 +1684,6 @@ ZEND_API int zend_declare_property(zend_class_entry *ce, char *name, int name_le
default:
break;
}
- } else {
- zval_update_constant(&property, (void *) 1 TSRMLS_CC);
}
switch (access_type & ZEND_ACC_PPP_MASK) {
case ZEND_ACC_PRIVATE: {