check if EcomDev_UrlRewrite is installed before loading model instance

danslo · Nov 6, 2014 · 3bd29b9 · 3bd29b9
1 parent 89bf9a2
commit 3bd29b9
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/code/Model/Observer.php b/code/Model/Observer.php
@@ -81,12 +81,11 @@ protected function _indexSearch(&$productIds)
      */
     protected function _indexProductRewrites(&$productIds)
     {
-        // Only generate URL rewrites when this module is enabled.
-        $indexer = Mage::getResourceSingleton('ecomdev_urlrewrite/indexer');
-        if ($indexer) {
-            return $indexer->updateProductRewrites($productIds);
+        if (!Mage::helper('core')->isModuleEnabled('EcomDev_UrlRewrite')) {
+            return $this;
         }
-        return $this;
+
+        return Mage::getResourceSingleton('ecomdev_urlrewrite/indexer')->updateProductRewrites($productIds);
     }
 
     /**
@@ -97,12 +96,11 @@ protected function _indexProductRewrites(&$productIds)
      */
     protected function _indexCategoryRewrites(&$categoryIds)
     {
-        // Only generate URL rewrites when this module is enabled.
-        $indexer = Mage::getResourceSingleton('ecomdev_urlrewrite/indexer');
-        if ($indexer) {
-            return $indexer->updateCategoryRewrites($categoryIds);
+        if (!Mage::helper('core')->isModuleEnabled('EcomDev_UrlRewrite')) {
+            return $this;
         }
-        return $this;
+
+        return Mage::getResourceSingleton('ecomdev_urlrewrite/indexer')->updateCategoryRewrites($categoryIds);
     }
 
     /**