Merge remote-tracking branch 'origin/MAGETWO-57719-error-500-on-checkout' into pr

jilu1 · jilu1 · commit f3145eb0a88c · 2016-10-06T13:38:42.000-05:00
diff --git a/app/code/Magento/CatalogInventory/Helper/Stock.php b/app/code/Magento/CatalogInventory/Helper/Stock.php
@@ -154,7 +154,10 @@ public function addIsInStockFilterToCollection($collection)
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
             $resource = $this->getStockStatusResource();
-            $resource->addStockDataToCollection($collection, !$isShowOutOfStock);
+            $resource->addStockDataToCollection(
+                $collection,
+                !$isShowOutOfStock && $collection->getFlag('require_stock_items')
+            );
             $collection->setFlag($stockFlag, true);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,10 @@ public function addIsInStockFilterToCollection($collection)`
`154`	`154`	`\Magento\Store\Model\ScopeInterface::SCOPE_STORE`
`155`	`155`	`);`
`156`	`156`	`$resource = $this->getStockStatusResource();`
`157`		`- $resource->addStockDataToCollection($collection, !$isShowOutOfStock);`
	`157`	`+ $resource->addStockDataToCollection(`
	`158`	`+ $collection,`
	`159`	`+ !$isShowOutOfStock && $collection->getFlag('require_stock_items')`
	`160`	`+ );`
`158`	`161`	`$collection->setFlag($stockFlag, true);`
`159`	`162`	`}`
`160`	`163`	`}`