Forcing new theme so we can safely delete unused themes and not break…

… upgrades. Closes #1496
photo · Jun 18, 2014 · 314998c · 314998c
1 parent 20ead64
commit 314998c
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/libraries/models/Theme.php b/src/libraries/models/Theme.php
@@ -14,7 +14,7 @@ public function __construct()
   {
     $this->template = getTemplate();
     $this->template->notification = new Notification;
-    $this->theme = getConfig()->get('defaults')->theme;
+    $this->theme = self::themeDefault;
     $behavior = getConfig()->get('behavior');
     $themeConfig = getConfig()->get('theme');
     $utilityObj = new Utility;
@@ -24,10 +24,6 @@ public function __construct()
       if(file_exists($mobileSettings = sprintf('%s/%s/config/settings-mobile.ini', getConfig()->get('paths')->themes, $this->getThemeName())))
         getConfig()->loadString(file_get_contents($mobileSettings));
     }
-    elseif($themeConfig !== null)
-    {
-      $this->theme = $themeConfig->name;
-    }
 
     $this->themeDir = sprintf('%s/%s', getConfig()->get('paths')->themes, $this->theme);
     $this->themeDirWeb = str_replace(sprintf('%s/html', dirname(dirname(dirname(__FILE__)))), '', $this->themeDir);