MAGETWO-57719: [Magento Cloud] - Intermittent HTTP ERROR 500 during c…

…heckout
magento · Sep 14, 2016 · c966dc1 · c966dc1 · pobrassard · Oct 26, 2016
1 parent 1ade3b7
commit c966dc1
Showing 1 changed file with 4 additions and 1 deletion.
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);
         }
     }