Merge branch 'master' of git://github.com/Grundik/zf2 into hotfix/pri…

…oritylist Conflicts: library/Zend/Stdlib/PriorityList.php
zendframework · Nov 19, 2014 · faf7f7b · faf7f7b
2 parents 5b4443c + e9812a0
commit faf7f7b
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/library/Zend/Stdlib/PriorityList.php b/library/Zend/Stdlib/PriorityList.php
@@ -193,6 +193,7 @@ public function rewind()
     public function current()
     {
         $node = current($this->items);
+        $this->currentNode = $node;
         return ($node !== false ? $node['data'] : false);
     }