From a5a2f73e15a6a2cd76a28a129385b32159b1eb20 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Fri, 16 Sep 2022 10:31:50 +0200 Subject: [PATCH] Fixed Mage::getSingleton('catalog/product_status')->addVisibleFilterToCollection() that does nothing --- .../Mage/Adminhtml/Model/Sales/Order/Random.php | 8 ++++---- .../Mage/Catalog/Block/Seo/Sitemap/Product.php | 14 ++++++-------- app/code/core/Mage/Catalog/Model/Layer.php | 5 ++--- .../core/Mage/CatalogSearch/Model/Advanced.php | 6 +++--- app/code/core/Mage/CatalogSearch/Model/Layer.php | 5 ++--- 5 files changed, 17 insertions(+), 21 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php index 71a1e6c367b..6e8fccf8c05 100644 --- a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php +++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Random.php @@ -76,13 +76,13 @@ protected function _getCustomers() protected function _getProducts() { if (!$this->_productCollection) { - $this->_productCollection= Mage::getResourceModel('catalog/product_collection'); - //$this->_productCollection->getEntity()->setStore($this->_getStore()); - Mage::getSingleton('catalog/product_status')->addVisibleFilterToCollection($this->_productCollection); + $this->_productCollection = Mage::getResourceModel('catalog/product_collection'); Mage::getSingleton('catalog/product_visibility')->addVisibleInSearchFilterToCollection($this->_productCollection); - $this->_productCollection->addAttributeToSelect('name') + $this->_productCollection + ->addAttributeToSelect('name') ->addAttributeToSelect('sku') ->addAttributeToFilter('type_id', Mage_Catalog_Model_Product_Type::TYPE_SIMPLE) + ->addAttributeToFilter('status', Mage_Catalog_Model_Product_Status::STATUS_ENABLED) ->load(); } return $this->_productCollection->getItems(); diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php index 027d647ac93..ff6aebfa5bc 100644 --- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php +++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Product.php @@ -36,18 +36,16 @@ class Mage_Catalog_Block_Seo_Sitemap_Product extends Mage_Catalog_Block_Seo_Site */ protected function _prepareLayout() { - $collection = Mage::getModel('catalog/product')->getCollection(); /** @var Mage_Catalog_Model_Resource_Product_Collection $collection */ - - $collection->addAttributeToSelect('name'); - $collection->addAttributeToSelect('url_key'); - $collection->addStoreFilter(); - - Mage::getSingleton('catalog/product_status')->addVisibleFilterToCollection($collection); + $collection = Mage::getModel('catalog/product')->getCollection(); + $collection + ->addAttributeToSelect('name') + ->addAttributeToSelect('url_key') + ->addStoreFilter() + ->addAttributeToFilter('status', Mage_Catalog_Model_Product_Status::STATUS_ENABLED); Mage::getSingleton('catalog/product_visibility')->addVisibleInCatalogFilterToCollection($collection); $this->setCollection($collection); - return $this; } diff --git a/app/code/core/Mage/Catalog/Model/Layer.php b/app/code/core/Mage/Catalog/Model/Layer.php index 74cfb289b0f..f8275de05ed 100644 --- a/app/code/core/Mage/Catalog/Model/Layer.php +++ b/app/code/core/Mage/Catalog/Model/Layer.php @@ -114,9 +114,8 @@ public function prepareProductCollection($collection) ->addAttributeToSelect(Mage::getSingleton('catalog/config')->getProductAttributes()) ->addPriceData() ->addTaxPercents() - ->addUrlRewrite($this->getCurrentCategory()->getId()); - - Mage::getSingleton('catalog/product_status')->addVisibleFilterToCollection($collection); + ->addUrlRewrite($this->getCurrentCategory()->getId()) + ->addAttributeToFilter('status', Mage_Catalog_Model_Product_Status::STATUS_ENABLED); Mage::getSingleton('catalog/product_visibility')->addVisibleInCatalogFilterToCollection($collection); return $this; diff --git a/app/code/core/Mage/CatalogSearch/Model/Advanced.php b/app/code/core/Mage/CatalogSearch/Model/Advanced.php index 7d57c6b3954..113bdc60d69 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Advanced.php +++ b/app/code/core/Mage/CatalogSearch/Model/Advanced.php @@ -327,10 +327,10 @@ public function prepareProductCollection($collection) ->setStore(Mage::app()->getStore()) ->addMinimalPrice() ->addTaxPercents() - ->addStoreFilter(); - - Mage::getSingleton('catalog/product_status')->addVisibleFilterToCollection($collection); + ->addStoreFilter() + ->addAttributeToFilter('status', Mage_Catalog_Model_Product_Status::STATUS_ENABLED); Mage::getSingleton('catalog/product_visibility')->addVisibleInSearchFilterToCollection($collection); + return $this; } } diff --git a/app/code/core/Mage/CatalogSearch/Model/Layer.php b/app/code/core/Mage/CatalogSearch/Model/Layer.php index 99ffd3e4686..ff8404e33c2 100644 --- a/app/code/core/Mage/CatalogSearch/Model/Layer.php +++ b/app/code/core/Mage/CatalogSearch/Model/Layer.php @@ -59,9 +59,8 @@ public function prepareProductCollection($collection) ->addPriceData() ->addTaxPercents() ->addStoreFilter() - ->addUrlRewrite(); - - Mage::getSingleton('catalog/product_status')->addVisibleFilterToCollection($collection); + ->addUrlRewrite() + ->addAttributeToFilter('status', Mage_Catalog_Model_Product_Status::STATUS_ENABLED); Mage::getSingleton('catalog/product_visibility')->addVisibleInSearchFilterToCollection($collection); return $this;