Respect Display Out of Stock Products setting for linked products (#584)

Author: fballiano

app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php

@@ -43,6 +43,10 @@ protected function _prepareData()
 
         Mage::getSingleton('catalog/product_visibility')->addVisibleInCatalogFilterToCollection($this->_itemCollection);
 
+        if (!Mage::helper('cataloginventory')->isShowOutOfStock()) {
+            Mage::getSingleton('cataloginventory/stock')->addInStockFilterToCollection($this->_itemCollection);
+        }
+
         $this->_itemCollection->load();
 
         foreach ($this->_itemCollection as $product) {

app/code/core/Mage/Catalog/Block/Product/List/Related.php

@@ -44,6 +44,10 @@ protected function _prepareData()
         }
         Mage::getSingleton('catalog/product_visibility')->addVisibleInCatalogFilterToCollection($this->_itemCollection);
 
+        if (!Mage::helper('cataloginventory')->isShowOutOfStock()) {
+            Mage::getSingleton('cataloginventory/stock')->addInStockFilterToCollection($this->_itemCollection);
+        }
+
         $this->_itemCollection->load();
 
         foreach ($this->_itemCollection as $product) {

app/code/core/Mage/Catalog/Block/Product/List/Upsell.php

@@ -48,6 +48,10 @@ protected function _prepareData()
         }
         Mage::getSingleton('catalog/product_visibility')->addVisibleInCatalogFilterToCollection($this->_itemCollection);
 
+        if (!Mage::helper('cataloginventory')->isShowOutOfStock()) {
+            Mage::getSingleton('cataloginventory/stock')->addInStockFilterToCollection($this->_itemCollection);
+        }
+
         if ($this->getItemLimit('upsell') > 0) {
             $this->_itemCollection->setPageSize($this->getItemLimit('upsell'));
         }

app/code/core/Mage/Checkout/Block/Cart/Crosssell.php

@@ -155,6 +155,7 @@ protected function _getCollection()
         $this->_addProductAttributesAndPrices($collection);
 
         Mage::getSingleton('catalog/product_visibility')->addVisibleInCatalogFilterToCollection($collection);
+        // Always filter out-of-stock regardless of setting, since cart crosssell items are meant for immediate purchase
         Mage::getSingleton('cataloginventory/stock')->addInStockFilterToCollection($collection);
 
         return $collection;