Merge pull request #476 from algolia/develop

Jan Petr · web-flow · commit ea96f1bc2d4a · 2016-06-29T16:24:50.000+02:00
Develop
diff --git a/code/Helper/Data.php b/code/Helper/Data.php
@@ -458,7 +458,11 @@ protected function getProductsRecords($storeId, $collection, $potentiallyDeleted
                 continue;
             }
             
-            if ($product->isDeleted() === true || $product->getStatus() == Mage_Catalog_Model_Product_Status::STATUS_DISABLED || (int) $product->getVisibility() <= Mage_Catalog_Model_Product_Visibility::VISIBILITY_NOT_VISIBLE || $product->getStockItem()->is_in_stock === '0') {
+            if ($product->isDeleted() === true
+                || $product->getStatus() == Mage_Catalog_Model_Product_Status::STATUS_DISABLED
+                || (int) $product->getVisibility() <= Mage_Catalog_Model_Product_Visibility::VISIBILITY_NOT_VISIBLE
+                || ($product->getStockItem()->is_in_stock == 0 && !$this->config->getShowOutOfStock($storeId))
+            ) {
                 $productsToRemove[$productId] = $productId;
                 continue;
             }

Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,11 @@ protected function getProductsRecords($storeId, $collection, $potentiallyDeleted`
`458`	`458`	`continue;`
`459`	`459`	`}`
`460`	`460`
`461`		`- if ($product->isDeleted() === true \|\| $product->getStatus() == Mage_Catalog_Model_Product_Status::STATUS_DISABLED \|\| (int) $product->getVisibility() <= Mage_Catalog_Model_Product_Visibility::VISIBILITY_NOT_VISIBLE \|\| $product->getStockItem()->is_in_stock === '0') {`
	`461`	`+ if ($product->isDeleted() === true`
	`462`	`+ \|\| $product->getStatus() == Mage_Catalog_Model_Product_Status::STATUS_DISABLED`
	`463`	`+ \|\| (int) $product->getVisibility() <= Mage_Catalog_Model_Product_Visibility::VISIBILITY_NOT_VISIBLE`
	`464`	`+ \|\| ($product->getStockItem()->is_in_stock == 0 && !$this->config->getShowOutOfStock($storeId))`
	`465`	`+ ) {`
`462`	`466`	`$productsToRemove[$productId] = $productId;`
`463`	`467`	`continue;`
`464`	`468`	`}`