Merge branch 'hotfix/2.0.1'

Nosto · Feb 24, 2015 · db036a6 · db036a6
2 parents 8706d48 + 991280e
commit db036a6
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -97,6 +97,10 @@ The extension is released under Open Software License ("OSL") v3.0
 
 ## Changelog
 
+### 2.0.1
+* Fix product tagging to check for tags only if Mage_Tag is enabled
+* Add Mage_Core, Mage_Catalog and Mage_Sales as extension dependencies
+
 ### 2.0.0
 * Support current category tagging on product pages
 * Update Nosto php-sdk

diff --git a/app/code/community/Nosto/Tagging/Model/Meta/Product.php b/app/code/community/Nosto/Tagging/Model/Meta/Product.php
@@ -304,16 +304,18 @@ public function loadData(Mage_Catalog_Model_Product $product)
             ? self::PRODUCT_IN_STOCK
             : self::PRODUCT_OUT_OF_STOCK;
 
-        $tagCollection = Mage::getModel('tag/tag')
-            ->getCollection()
-            ->addPopularity()
-            ->addStatusFilter(Mage_Tag_Model_Tag::STATUS_APPROVED)
-            ->addProductFilter($product->getId())
-            ->setFlag('relation', true)
-            ->addStoreFilter(Mage::app()->getStore()->getId())
-            ->setActiveFilter();
-        foreach ($tagCollection as $tag) {
-            $this->_tags[] = $tag->getName();
+        if (Mage::helper('core')->isModuleEnabled('Mage_Tag')) {
+            $tagCollection = Mage::getModel('tag/tag')
+                ->getCollection()
+                ->addPopularity()
+                ->addStatusFilter(Mage_Tag_Model_Tag::STATUS_APPROVED)
+                ->addProductFilter($product->getId())
+                ->setFlag('relation', true)
+                ->addStoreFilter(Mage::app()->getStore()->getId())
+                ->setActiveFilter();
+            foreach ($tagCollection as $tag) {
+                $this->_tags[] = $tag->getName();
+            }
         }
 
         if (!$product->canConfigure()) {

diff --git a/app/code/community/Nosto/Tagging/etc/config.xml b/app/code/community/Nosto/Tagging/etc/config.xml
@@ -29,7 +29,7 @@
 <config>
     <modules>
         <Nosto_Tagging>
-            <version>2.0.0</version>
+            <version>2.0.1</version>
         </Nosto_Tagging>
     </modules>
     <global>

diff --git a/app/etc/modules/Nosto_Tagging.xml b/app/etc/modules/Nosto_Tagging.xml
@@ -27,10 +27,15 @@
  */
 -->
 <config>
-	<modules>
-		<Nosto_Tagging>
-			<active>true</active>
-			<codePool>community</codePool>
-		</Nosto_Tagging>
-	</modules>
+    <modules>
+        <Nosto_Tagging>
+            <active>true</active>
+            <codePool>community</codePool>
+            <depends>
+                <Mage_Core/>
+                <Mage_Catalog/>
+                <Mage_Sales/>
+            </depends>
+        </Nosto_Tagging>
+    </modules>
 </config>