From d890121bcda560bb6472b510e89a881cec190bdf Mon Sep 17 00:00:00 2001
From: Vova Yatsyuk <vovayatsyuk@users.noreply.github.com>
Date: Fri, 2 Jan 2015 16:29:09 +0200
Subject: [PATCH] Added additional check for ConfigurableSwatches status

---
 .../TM/CatalogConfigurableSwatches/Helper/Data.php     | 10 ++++++++++
 .../TM/CatalogConfigurableSwatches/etc/config.xml      | 10 ++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 app/code/community/TM/CatalogConfigurableSwatches/Helper/Data.php

diff --git a/app/code/community/TM/CatalogConfigurableSwatches/Helper/Data.php b/app/code/community/TM/CatalogConfigurableSwatches/Helper/Data.php
new file mode 100644
index 0000000..964adee
--- /dev/null
+++ 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
index 5be9bed..b5921b8 100644
--- 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>