diff options
| author | Nikita Popov <nikic@php.net> | 2014-05-03 10:49:10 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-05-03 11:29:08 +0200 |
| commit | 42d4adabbd5f497ff8117aac44d2b178854e587b (patch) | |
| tree | 1b58bc25ab7ca85e177bb93a0431095accc1ec08 /Zend/zend_operators.c | |
| parent | 65f488ece3f946d53b12b8c265185a483b079dfb (diff) | |
| download | php-git-42d4adabbd5f497ff8117aac44d2b178854e587b.tar.gz | |
Fix SXE->string cast for __toString in inheriting class
This issue was originally hacked around in zend_make_printable_zval.
I've now moved the overridden __toString() handling into the SXE
cast_object handler, so everything invoking that handler
(zend_make_printable_zval, convert_to_string, zval_get_string,
and various other more obscure usages) see the same behavior.
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 5c79a98142..4093a8adea 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -921,9 +921,6 @@ try_again: return STR_INIT("Array", sizeof("Array")-1, 0); case IS_OBJECT: { zval tmp; - //???if (zend_std_cast_object_tostring(op, &tmp, IS_STRING TSRMLS_CC) == SUCCESS) { - //??? return Z_STR(tmp); - //???} if (Z_OBJ_HT_P(op)->cast_object) { if (Z_OBJ_HT_P(op)->cast_object(op, &tmp, IS_STRING TSRMLS_CC) == SUCCESS) { return Z_STR(tmp); |