com php-src: Revert "zend_make_printable_zval choses cast_object over __toString": Zend/zend.c
| From: | Xinchen Hui | Date: | Sun, 12 Aug 2012 04:02:06 +0000 |
| Subject: | com php-src: Revert "zend_make_printable_zval choses cast_object over __toString": Zend/zend.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69810@lists.php.net to get a copy of this message | ||
Commit: 75f6c8d42cfcf856d7a12f67c3981f3ad62660e9
Author: Xinchen Hui <laruence@php.net> Sun, 12 Aug 2012 12:02:06 +0800
Parents: 32c1c5a19fab5c1471a5902a54efcd0875fe7e79
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=75f6c8d42cfcf856d7a12f67c3981f3ad62660e9
Log:
Revert "zend_make_printable_zval choses cast_object over __toString"
This reverts commit a5dfd414941953c282bb68f6b08685252ca93a1a.
Changed paths:
M Zend/zend.c
Diff:
diff --git a/Zend/zend.c b/Zend/zend.c
index be30e92..18c4f11 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;