Merge remote-tracking branch 'origin/master'

Author: avstudnitz

README.md

@@ -99,4 +99,4 @@ It offers more features, such as an extensive autosuggest window, multiselect fi
 categories loaded via Solr and support of Magento Enterprise Edition. For more information, please visit our 
 [website](https://www.integer-net.com/solr-magento/).
 
-[![Upgrade to IntegerNet_Solr Pro](src/skin/adminhtml/default/default/integernet/solr/solr_free_banner_upgrade_to_pro.png)](http://integernet-solr.com/features/?utm_source=readme&utm_medium=banner&utm_term=features&utm_content=features&utm_campaign=upgrade)
+[![Upgrade to IntegerNet_Solr Pro](src/skin/adminhtml/default/default/integernet/solr/solr_free_banner_upgrade_to_pro.png)](https://integernet-solr.com/features/?utm_source=readme&utm_medium=banner&utm_term=features&utm_content=features&utm_campaign=upgrade)

src/app/code/community/IntegerNet/Solr/Model/Observer.php

@@ -326,4 +326,28 @@ public function afterFastSimpleImportReindex(Varien_Event_Observer $observer)
 
         Mage::helper('integernet_solr')->factory()->getProductIndexer()->reindex($productIds);
     }
-}
+
+    public function afterFlatCategoryLoadedUseBackendModel(Varien_Event_Observer $observer)
+    {
+        if (!Mage::getStoreConfigFlag('integernet_solr/general/is_active')) {
+            return;
+        }
+
+        /** @var Mage_Catalog_Model_Category $category */
+        $category = $observer->getCategory();
+
+        if (!$category || !$category->getId()) {
+            return;
+        }
+
+        if (!Mage::helper('catalog/category_flat')->isEnabled() || !$category->getResource() instanceof Mage_Catalog_Model_Resource_Category_Flat) {
+            return;
+        }
+
+        $filtersToRemove = $category->getData('solr_remove_filters');
+
+        if ($filtersToRemove && !is_array($filtersToRemove)) {
+            $category->setData('solr_remove_filters', explode(',', $filtersToRemove));
+        }
+    }
+}

src/app/code/community/IntegerNet/Solr/etc/config.xml

@@ -230,6 +230,15 @@
                     </review>
                 </observers>
             </catalog_block_product_list_collection>
+            <catalog_category_load_after>
+                <observers>
+                    <integernet_solr>
+                        <type>singleton</type>
+                        <class>integernet_solr/observer</class>
+                        <method>afterFlatCategoryLoadedUseBackendModel</method>
+                    </integernet_solr>
+                </observers>
+            </catalog_category_load_after>
         </events>
     </frontend>
 
@@ -282,4 +291,4 @@
             </modules>
         </suite>
     </phpunit>
-</config>
+</config>