summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2004-03-17 15:49:34 +0000
committerAndi Gutmans <andi@php.net>2004-03-17 15:49:34 +0000
commit09341786dcec7e5202ae38214f71f9b518965d00 (patch)
tree91b17aacd407ea5d56170d1c94d580826579cf4c
parentccb515afc79114693177338c31f4ebf2050a66d0 (diff)
downloadphp-git-09341786dcec7e5202ae38214f71f9b518965d00.tar.gz
- Stop make_printable_zval() from calling __toString()
-rw-r--r--Zend/zend.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend.c b/Zend/zend.c
index 81225381b4..b21a2cff3a 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -216,6 +216,7 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop
case IS_OBJECT:
{
TSRMLS_FETCH();
+#if 0
/* Standard PHP objects */
if (expr->value.obj.handlers == &std_object_handlers) {
if (zend_std_cast_object_tostring(expr, expr_copy, IS_STRING, 0 TSRMLS_CC) == SUCCESS) {
@@ -223,6 +224,7 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop
}
zend_error(E_NOTICE, "Object of class %s could not be converted to string", Z_OBJCE_P(expr)->name);
}
+#endif
if (expr->value.obj.handlers->cast_object &&
expr->value.obj.handlers->cast_object(expr, expr_copy, IS_STRING, 0 TSRMLS_CC) == SUCCESS) {
break;