summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2004-03-04 13:11:03 +0000
committerStanislav Malyshev <stas@php.net>2004-03-04 13:11:03 +0000
commit97e7ce733a6f765410e9f2c755f978a29e144005 (patch)
treec3f07a6d6189c5b7ea683653a5ba2fcdd4d084b6
parent99edaa3a4fdeeccb92b584083ebe08f70c61a7ca (diff)
downloadphp-git-97e7ce733a6f765410e9f2c755f978a29e144005.tar.gz
fix the fix
-rw-r--r--Zend/zend_execute.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index dc72a06e6b..70d6f15d03 100644
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -93,9 +93,13 @@ static inline int i_zend_is_true(zval *op)
result = (zend_hash_num_elements(op->value.ht)?1:0);
break;
case IS_OBJECT:
- if(EG(ze1_compatibility_mode) && IS_ZEND_STD_OBJECT(op)) {
+ if(IS_ZEND_STD_OBJECT(*op)) {
TSRMLS_FETCH();
- result = (zend_hash_num_elements(Z_OBJPROP_PP(op))?1:0);
+ if(EG(ze1_compatibility_mode)) {
+ result = (zend_hash_num_elements(Z_OBJPROP_P(op))?1:0);
+ } else {
+ result = 1;
+ }
} else {
result = 1;
}