From: Antony Dovgal <tony2001@php.net>
Date: Wed, 27 Dec 2006 17:22:22 +0000 (+0000)
Subject: restore old behaviour when casting objects to strings and NULL
X-Git-Tag: RELEASE_1_0_0RC1~479
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5204c963232bdb2a9fa0fc9a41f3351dea961290;p=php

restore old behaviour when casting objects to strings and NULL
---

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index df93a4827a..f1f4456837 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -513,7 +513,6 @@ ZEND_API int convert_to_null(zval *op)
 			}
 			*op = *org;
 			FREE_ZVAL(org);
-			return FAILURE;
 		}
 	}
 
@@ -902,7 +901,6 @@ ZEND_API int _convert_to_unicode_with_converter(zval *op, UConverter *conv TSRML
 					zend_error(E_RECOVERABLE_ERROR,
 							   "Object of class %v could not be converted to %s", Z_OBJCE_P(op)->name,
 							   zend_get_type_by_const(IS_UNICODE));
-					return FAILURE;
 				} else {
 					zval_dtor(op);
 					Z_TYPE_P(op) = IS_UNICODE;
@@ -1013,7 +1011,6 @@ ZEND_API int _convert_to_string_with_converter(zval *op, UConverter *conv TSRMLS
 					zend_error(E_RECOVERABLE_ERROR,
 							   "Object of class %v could not be converted to %s", Z_OBJCE_P(op)->name,
 							   zend_get_type_by_const(IS_STRING));
-					return FAILURE;
 				} else {
 					zval_dtor(op);
 					Z_TYPE_P(op) = IS_STRING;