diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-07-15 00:36:35 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-07-15 00:36:35 -0700 |
| commit | 68e630b72f52aaa994cde8082f912a2d91b1b9c6 (patch) | |
| tree | 9be29ac0af8b46a0e7fdf892f1c55e46dae75086 /ext/spl | |
| parent | 0aadbf7578a89f1d8fcc1cc23d0751af9e6a739a (diff) | |
| parent | e617679c0ba616551df62ad370a70d5cf610c270 (diff) | |
| download | php-git-68e630b72f52aaa994cde8082f912a2d91b1b9c6.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
fix invalid variable name at ext/spl/internal/multipleiterator.inc
Diffstat (limited to 'ext/spl')
| -rw-r--r-- | ext/spl/internal/multipleiterator.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/spl/internal/multipleiterator.inc b/ext/spl/internal/multipleiterator.inc index 2ed71d53a7..12df011ecc 100644 --- a/ext/spl/internal/multipleiterator.inc +++ b/ext/spl/internal/multipleiterator.inc @@ -163,7 +163,7 @@ class MultipleIterator implements Iterator $retval = array(); foreach($this->iterators as $iter) { - if ($it->valid()) + if ($iter->valid()) { if ($this->flags & self::MIT_KEYS_ASSOC) { @@ -205,7 +205,7 @@ class MultipleIterator implements Iterator $retval = array(); foreach($this->iterators as $iter) { - if ($it->valid()) + if ($iter->valid()) { $retval[] = $iter->key(); } |