cvs: php-src /ext/spl/examples recursivetreeiterator.inc
| From: | Marcus Boerger | Date: | Fri, 07 Oct 2005 23:14:51 +0000 |
| Subject: | cvs: php-src /ext/spl/examples recursivetreeiterator.inc | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34412@lists.php.net to get a copy of this message | ||
helly Fri Oct 7 19:14:51 2005 EDT
Modified files:
/php-src/ext/spl/examples recursivetreeiterator.inc
Log:
- Prevent notices from showing up if inner's current() does not return a string
http://cvs.php.net/diff.php/php-src/ext/spl/examples/recursivetreeiterator.inc?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/spl/examples/recursivetreeiterator.inc
diff -u php-src/ext/spl/examples/recursivetreeiterator.inc:1.3
php-src/ext/spl/examples/recursivetreeiterator.inc:1.4
--- php-src/ext/spl/examples/recursivetreeiterator.inc:1.3 Wed Oct 5 15:10:22 2005
+++ php-src/ext/spl/examples/recursivetreeiterator.inc Fri Oct 7 19:14:49 2005
@@ -60,7 +60,7 @@
*/
function getEntry()
{
- return $this->callToString ? $this->__toString() : parent::current();
+ return $this->callToString ? $this->__toString() : @(string)parent::current();
}
/** @return string to place after the current element