From: Xinchen Hui <laruence@php.net>
Date: Sun, 12 Aug 2012 04:02:06 +0000 (+0800)
Subject: Revert "zend_make_printable_zval choses cast_object over __toString"
X-Git-Tag: php-5.5.0alpha1~20^2~97
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75f6c8d42cfcf856d7a12f67c3981f3ad62660e9;p=php

Revert "zend_make_printable_zval choses cast_object over __toString"

This reverts commit a5dfd414941953c282bb68f6b08685252ca93a1a.
---

diff --git a/Zend/zend.c b/Zend/zend.c
index be30e92e7d..18c4f11604 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -258,12 +258,6 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop
 			{
 				TSRMLS_FETCH();
 
-				if (Z_OBJCE_P(expr)->__tostring) {
-					if (zend_std_cast_object_tostring(expr, expr_copy, IS_STRING TSRMLS_CC) == SUCCESS) {
-						break;
-					}
-				}
-
 				if (Z_OBJ_HANDLER_P(expr, cast_object)) {
 					zval *val;