]> granicus.if.org Git - php/commitdiff
Revert "zend_make_printable_zval choses cast_object over __toString"
authorXinchen Hui <laruence@php.net>
Sun, 12 Aug 2012 04:02:06 +0000 (12:02 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 12 Aug 2012 04:02:06 +0000 (12:02 +0800)
This reverts commit a5dfd414941953c282bb68f6b08685252ca93a1a.

Zend/zend.c

index be30e92e7ddd7d2e1068c6e92289a0883cd80e26..18c4f11604c9dc100476d6d690e828d8ebce41f7 100644 (file)
@@ -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;