Merge pull request #16 from tim-bezhashvyly/patch-1

Issue #15: Fallback to Magneto if category is excluded from Solr index

Author: Fabian Schmengler /

src/app/code/community/IntegerNet/Solr/Model/Catalog/Layer.php

@@ -20,13 +20,17 @@ public function getProductCollection()
             return parent::getProductCollection();
         }
 
-        if (isset($this->_productCollections[$this->getCurrentCategory()->getId()])) {
-            $collection = $this->_productCollections[$this->getCurrentCategory()->getId()];
-        } else {
-            $collection = Mage::getModel('integernet_solr/result_collection');
-            $this->_productCollections[$this->getCurrentCategory()->getId()] = $collection;
+        $category = $this->getCurrentCategory();
+
+        if ($category->getData('solr_exclude')) {
+            return parent::getProductCollection();
         }
-        return $collection;
+
+        if (! isset($this->_productCollections[$category->getId()])) {
+            $this->_productCollections[$category->getId()] = Mage::getModel('integernet_solr/result_collection');
+        }
+
+        return $this->_productCollections[$category->getId()];
     }
 
     /**
@@ -52,4 +56,4 @@ public function getFilterableAttributes()
         return $collection;
     }
 
-}
+}