diff options
| author | Andi Gutmans <andi@php.net> | 2003-12-01 11:47:52 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2003-12-01 11:47:52 +0000 |
| commit | a411d608fa55310105df7afd0e8d98f261188c6f (patch) | |
| tree | 71be5405f065810c7ccc5822c5eee2d35b04948b /Zend/zend_operators.c | |
| parent | 91b7cc20791d4a692a029ebdf292bb9e9c2c0c68 (diff) | |
| download | php-git-a411d608fa55310105df7afd0e8d98f261188c6f.tar.gz | |
- Don't automatically call __toString() in convert_to_string_ex().
- use __toString() in your code.
- Keep the auto-case in make_printable_zval.
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 8a6f78e645..d26bee861e 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -492,6 +492,7 @@ ZEND_API void _convert_to_string(zval *op ZEND_FILE_LINE_DC) 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 @@ ZEND_API void _convert_to_string(zval *op ZEND_FILE_LINE_DC) } 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; |