Added additional check for ConfigurableSwatches status

tmhub · Jan 2, 2015 · d890121 · d890121
1 parent 281be49
commit d890121
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/app/code/community/TM/CatalogConfigurableSwatches/Helper/Data.php b/app/code/community/TM/CatalogConfigurableSwatches/Helper/Data.php
@@ -0,0 +1,10 @@
+<?php
+
+class TM_CatalogConfigurableSwatches_Helper_Data extends Mage_Core_Helper_Abstract
+{
+    public function isEnabled()
+    {
+        return Mage::helper('core')->isModuleOutputEnabled('Mage_ConfigurableSwatches')
+            && Mage::getStoreConfigFlag('configswatches/general/enabled');
+    }
+}
diff --git a/app/code/community/TM/CatalogConfigurableSwatches/etc/config.xml b/app/code/community/TM/CatalogConfigurableSwatches/etc/config.xml
@@ -5,13 +5,19 @@
             <version>1.0.0</version>
         </TM_CatalogConfigurableSwatches>
     </modules>
+    <global>
+        <helpers>
+            <catalogconfigurableswatches>
+                <class>TM_CatalogConfigurableSwatches_Helper</class>
+            </catalogconfigurableswatches>
+        </helpers>
+    </global>
     <frontend>
         <tm_layout>
             <updates>
                 <catalogconfigurableswatches
                     module="TM_CatalogConfigurableSwatches"
-                    condition="core/isModuleOutputEnabled"
-                    args="Mage_ConfigurableSwatches"
+                    condition="catalogconfigurableswatches/isEnabled"
                 >
                     <file>tm/configurableswatches.xml</file>
                 </catalogconfigurableswatches>