summaryrefslogtreecommitdiff
path: root/Zend/zend_execute.c
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2001-08-18 18:16:49 +0000
committerAndi Gutmans <andi@php.net>2001-08-18 18:16:49 +0000
commitd87fa22532e91a68616e0c64542f13f91b996132 (patch)
treeef67d244bb15bcd032091a4e2db83e3b428a1ace /Zend/zend_execute.c
parente74c4e0a45a07d87f6824cd4695c83b10c6a2db7 (diff)
downloadphp-git-d87fa22532e91a68616e0c64542f13f91b996132.tar.gz
- Merge Sterling's patches from ZE1
Diffstat (limited to 'Zend/zend_execute.c')
-rw-r--r--Zend/zend_execute.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 159bca5b4f..04ca8dcb86 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -857,8 +857,8 @@ static void zend_fetch_property_address(znode *result, znode *op1, znode *op2, t
}
if (container->type == IS_OBJECT &&
- (type == BP_VAR_W && Z_OBJCE_P(container)->handle_property_set ||
- type != BP_VAR_W && Z_OBJCE_P(container)->handle_property_get)) {
+ ((type == BP_VAR_W && Z_OBJCE_P(container)->handle_property_set) ||
+ (type != BP_VAR_W && Z_OBJCE_P(container)->handle_property_get))) {
zend_overloaded_element overloaded_element;
Ts[result->u.var].EA.data.overloaded_element.object = container;