summaryrefslogtreecommitdiff
path: root/ext/spl/internal
diff options
context:
space:
mode:
authorOndřej Surý <ondrej@sury.org>2013-07-22 08:22:22 +0200
committerOndřej Surý <ondrej@sury.org>2013-07-22 08:22:22 +0200
commitd837b4550418036e76d6adb3c7dad94b1e3a5a6a (patch)
tree1f1c808039c898d7d891975d3788531a2a6550f1 /ext/spl/internal
parent706ac6417162d94eb701952d40df136cd9528b56 (diff)
downloadphp-d837b4550418036e76d6adb3c7dad94b1e3a5a6a.tar.gz
New upstream version 5.5.1+dfsgupstream/5.5.1+dfsg
Diffstat (limited to 'ext/spl/internal')
-rw-r--r--ext/spl/internal/iteratoriterator.inc2
-rw-r--r--ext/spl/internal/multipleiterator.inc4
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/spl/internal/iteratoriterator.inc b/ext/spl/internal/iteratoriterator.inc
index 37676e053..451d05da3 100644
--- a/ext/spl/internal/iteratoriterator.inc
+++ b/ext/spl/internal/iteratoriterator.inc
@@ -17,7 +17,7 @@
* an Iterator. It is very important to understand that most classes that do
* not implement Iterator have their reasone to. Most likely they do not allow
* the full Iterator feature set. If so you need to provide techniques to
- * prevent missuse. If you do not you must expect exceptions or fatal erros.
+ * prevent missuse. If you do not you must expect exceptions or fatal errors.
*
* It is also possible to derive the class and implement IteratorAggregate by
* downcasting the instances returned in getIterator. See the following
diff --git a/ext/spl/internal/multipleiterator.inc b/ext/spl/internal/multipleiterator.inc
index 2ed71d53a..12df011ec 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();
}