Update Stock.php

Corefix · web-flow · commit a60276269e7f · 2017-03-01T12:40:24.000+01:00
Relates to issue: #8566 A flag set to null will always overwrite the isShowOutOfStock variable. So you can't set the default value from the admin configuration.
diff --git a/app/code/Magento/CatalogInventory/Helper/Stock.php b/app/code/Magento/CatalogInventory/Helper/Stock.php
@@ -156,7 +156,7 @@ public function addIsInStockFilterToCollection($collection)
             $resource = $this->getStockStatusResource();
             $resource->addStockDataToCollection(
                 $collection,
-                !$isShowOutOfStock && $collection->getFlag('require_stock_items')
+                !$isShowOutOfStock || $collection->getFlag('require_stock_items')
             );
             $collection->setFlag($stockFlag, true);
         }

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