diff options
| -rw-r--r-- | Zend/zend_execute.h | 8 |
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; } |