MAGETWO-48544: Merge branch 'feature/fix-to-array' of git://github.com/erikhansen/magento2 into MAGETWO-48544

ishakhsuvarov · ishakhsuvarov · commit d3f13c076a56 · 2016-01-29T11:20:19.000+02:00
diff --git a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
@@ -1514,7 +1514,7 @@ public function setOrder($attribute, $dir = self::SORT_ORDER_ASC)
     public function toArray($arrAttributes = [])
     {
         $arr = [];
-        foreach ($this->_items as $key => $item) {
+        foreach ($this->getItems() as $key => $item) {
             $arr[$key] = $item->toArray($arrAttributes);
         }
         return $arr;

Original file line number	Diff line number	Diff line change
`@@ -1514,7 +1514,7 @@ public function setOrder($attribute, $dir = self::SORT_ORDER_ASC)`
`1514`	`1514`	`public function toArray($arrAttributes = [])`
`1515`	`1515`	`{`
`1516`	`1516`	`$arr = [];`
`1517`		`- foreach ($this->_items as $key => $item) {`
	`1517`	`+ foreach ($this->getItems() as $key => $item) {`
`1518`	`1518`	`$arr[$key] = $item->toArray($arrAttributes);`
`1519`	`1519`	`}`
`1520`	`1520`	`return $arr;`