Merge pull request #23 from integer-net/indexing-bug-multistore

Indexing bug multistore

Author: avstudnitz

src/app/code/community/IntegerNet/Solr/Model/Bridge/ProductRepository.php

@@ -70,6 +70,9 @@ function($parentId, $childrenIds) {
      */
     public function getAllProductIds()
     {
+        // Fixes a bug with flat product collections called for different stores, see https://magento.stackexchange.com/q/30956/2207
+        Mage::unregister('_resource_singleton/catalog/product_flat');
+
         /** @var $productCollection Mage_Catalog_Model_Resource_Product_Collection */
         $productCollection = Mage::getResourceModel('catalog/product_collection');
         return $productCollection->getAllIds();

src/app/code/community/IntegerNet/Solr/Test/Model/Result.php

@@ -95,7 +95,7 @@ public function shouldUseParametersBasedOnToolbar()
             )
         );
         $logMock->expects($this->at(4))->method('debug')->with(
-            'Filter Query: store_id:1 AND is_visible_in_search_i:1');
+            'Filter Query: content_type:product AND store_id:1 AND is_visible_in_search_i:1');
 
         /* @var Mage_Core_Block_Text $toolbar Not using actual toolbar block which reads from session */
         $toolbar = $this->app()->getLayout()->createBlock('core/text', 'product_list_toolbar');