summaryrefslogtreecommitdiff
path: root/Zend/zend_operators.c
diff options
context:
space:
mode:
Diffstat (limited to 'Zend/zend_operators.c')
-rw-r--r--Zend/zend_operators.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 3660671396..a2da9d1fe3 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -887,7 +887,8 @@ try_again:
}
case IS_ARRAY:
zend_error(E_NOTICE, "Array to string conversion");
- return ZSTR_KNOWN(ZEND_STR_ARRAY_CAPITALIZED);
+ return (try && UNEXPECTED(EG(exception))) ?
+ NULL : ZSTR_KNOWN(ZEND_STR_ARRAY_CAPITALIZED);
case IS_OBJECT: {
zval tmp;
if (Z_OBJ_HT_P(op)->cast_object) {