From 314998cf427f78d1530f5e218e6534d3888cd109 Mon Sep 17 00:00:00 2001
From: Jaisen Mathai <jaisen@jmathai.com>
Date: Wed, 18 Jun 2014 15:40:27 -0400
Subject: [PATCH] Forcing new theme so we can safely delete unused themes and
 not break upgrades. Closes #1496

---
 src/libraries/models/Theme.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/libraries/models/Theme.php b/src/libraries/models/Theme.php
index 578c0cfde..651bf4d18 100644
--- 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);