Added isset check before TM_Argento usage

tmhub · Feb 8, 2017 · ced97ef · ced97ef
1 parent 798ad42
commit ced97ef
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/app/code/community/TM/Core/Model/Resource/Module/RemoteCollection.php b/app/code/community/TM/Core/Model/Resource/Module/RemoteCollection.php
@@ -96,17 +96,24 @@ public function loadData($printQuery = false, $logQuery = false)
         ];
 
         // fix for argento themes
-        $argento = array(
-            'TM_ArgentoArgento',
-            'TM_ArgentoFlat',
-            'TM_ArgentoMall',
-            'TM_ArgentoPure',
-            'TM_ArgentoPure2',
-            'TM_ArgentoLuxury',
-        );
-        foreach ($argento as $theme) {
-            if (!isset($modules[$theme])) {
-                $modules[$theme] = $modules['TM_Argento'];
+        if (isset($modules['TM_Argento'])) {
+            $argento = array(
+                'TM_ArgentoArgento',
+                'TM_ArgentoFlat',
+                'TM_ArgentoMall',
+                'TM_ArgentoPure',
+                'TM_ArgentoPure2',
+                'TM_ArgentoLuxury',
+            );
+            foreach ($argento as $theme) {
+                if (!isset($modules[$theme])) {
+                    $modules[$theme] = array();
+                }
+
+                $modules[$theme] = array_merge(
+                    $modules['TM_Argento'],
+                    $modules[$theme]
+                );
                 $modules[$theme]['code'] = $theme;
             }
         }