From 5d832a2f7b5b19fc68bd1a5890e378715a66debd Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Fri, 25 Jul 2014 17:21:06 +1000
Subject: [PATCH] Fixes #461

---
 modules/cms/classes/Theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cms/classes/Theme.php b/modules/cms/classes/Theme.php
index ca7b92715..440c98bdf 100644
--- a/modules/cms/classes/Theme.php
+++ b/modules/cms/classes/Theme.php
@@ -145,7 +145,7 @@ class Theme
     {
         $editTheme = Config::get('cms.editTheme');
         if (!$editTheme)
-            $editTheme = Config::get('cms.activeTheme');
+            $editTheme = static::getActiveTheme()->getDirName();
 
         $apiResult = Event::fire('cms.editTheme', [], true);
         if ($apiResult !== null)