From 4fc4c7b489b76f39c7026d37761fa0cd4a925b27 Mon Sep 17 00:00:00 2001 From: kazusuke sasezaki Date: Wed, 26 Jun 2013 00:26:06 +0900 Subject: [PATCH 1/2] fix invalid variable name at ext/spl/internal/multipleiterator.inc --- ext/spl/internal/multipleiterator.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/spl/internal/multipleiterator.inc b/ext/spl/internal/multipleiterator.inc index 2ed71d53a7e1c..3c1719e696bd8 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) { From 6f342355e50de1318366de839e54b97ea4db7959 Mon Sep 17 00:00:00 2001 From: sasezaki Date: Wed, 26 Jun 2013 01:04:26 +0900 Subject: [PATCH 2/2] fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too) --- ext/spl/internal/multipleiterator.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/spl/internal/multipleiterator.inc b/ext/spl/internal/multipleiterator.inc index 3c1719e696bd8..12df011ecc8b9 100644 --- a/ext/spl/internal/multipleiterator.inc +++ b/ext/spl/internal/multipleiterator.inc @@ -205,7 +205,7 @@ class MultipleIterator implements Iterator $retval = array(); foreach($this->iterators as $iter) { - if ($it->valid()) + if ($iter->valid()) { $retval[] = $iter->key(); }