Update against mainline

evgk · evgk · commit 2b06a484f902 · 2017-03-15T05:53:24.000-04:00
diff --git a/app/code/Magento/Catalog/Block/Product/ListProduct.php b/app/code/Magento/Catalog/Block/Product/ListProduct.php
@@ -84,7 +84,7 @@ public function __construct(
     }
 
     /**
-     * Retrieve loaded category collection
+     * Retrieve loaded product collection
      *
      * The goal of this method is to choose whether the existing collection should be returned
      * or a new one should be initialized.
@@ -357,7 +357,7 @@ private function initializeProductCollection()
             // if the product is associated with any category
             if ($categories->count()) {
                 // show products from this category
-                $this->setCategoryId(current($categories->getIterator()));
+                $this->setCategoryId(current($categories->getIterator())->getId());
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public function __construct(`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`/**`
`87`		`- * Retrieve loaded category collection`
	`87`	`+ * Retrieve loaded product collection`
`88`	`88`	`*`
`89`	`89`	`* The goal of this method is to choose whether the existing collection should be returned`
`90`	`90`	`* or a new one should be initialized.`
`@@ -357,7 +357,7 @@ private function initializeProductCollection()`
`357`	`357`	`// if the product is associated with any category`
`358`	`358`	`if ($categories->count()) {`
`359`	`359`	`// show products from this category`
`360`		`- $this->setCategoryId(current($categories->getIterator()));`
	`360`	`+ $this->setCategoryId(current($categories->getIterator())->getId());`
`361`	`361`	`}`
`362`	`362`	`}`
`363`	`363`