cvs: ZendEngine2 / zend_operators.c

andi Mon Dec 1 06:47:52 2003 EDT Modified files: /ZendEngine2 zend_operators.c Log: - Don't automatically call __toString() in convert_to_string_ex(). - use __toString() in your code. - Keep the auto-case in make_printable_zval. Index: ZendEngine2/zend_operators.c diff -u ZendEngine2/zend_operators.c:1.168 ZendEngine2/zend_operators.c:1.169 --- ZendEngine2/zend_operators.c:1.168 Mon Nov 24 15:57:53 2003 +++ ZendEngine2/zend_operators.c Mon Dec 1 06:47:52 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_operators.c,v 1.168 2003/11/24 20:57:53 helly Exp $ */ +/* $Id: zend_operators.c,v 1.169 2003/12/01 11:47:52 andi Exp $ */ #include <ctype.h> @@ -492,6 +492,7 @@ op->value.str.len = sizeof("Array")-1; break; case IS_OBJECT: { +#if ANDI_0 TSRMLS_FETCH(); if (op->value.obj.handlers->cast_object) { if (op->value.obj.handlers->cast_object(op, op, IS_STRING, 1 TSRMLS_CC) == SUCCESS) { @@ -501,6 +502,7 @@ } else { zend_error(E_NOTICE, "Object of class %s to string conversion", Z_OBJCE_P(op)->name); } +#endif zval_dtor(op); op->value.str.val = estrndup_rel("Object", sizeof("Object")-1); op->value.str.len = sizeof("Object")-1;