Get "activeTheme" from settings"

closes TryGhost#107 - removed "activeTheme" from config.js - read "activeTheme" from db setting
sebgie · Aug 26, 2013 · 5f821eb · 5f821eb
1 parent 3209a96
commit 5f821eb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/config.js b/config.js
@@ -13,9 +13,6 @@ config.forceI18n = true;
 
 // ## Themes & Plugins
 
-// Current active theme
-config.activeTheme = 'casper';
-
 // Current active plugins
 config.activePlugins = [
     'FancyFirstChar'

diff --git a/core/ghost.js b/core/ghost.js
@@ -107,7 +107,7 @@ Ghost = function () {
                     'appRoot':          appRoot,
                     'themePath':        themePath,
                     'pluginPath':       pluginPath,
-                    'activeTheme':      path.join(themePath, config.activeTheme),
+                    'activeTheme':      path.join(themePath, !instance.settingsCache ? "" : instance.settingsCache.activeTheme),
                     'adminViews':       path.join(appRoot, '/core/server/views/'),
                     'helperTemplates':  path.join(appRoot, '/core/server/helpers/tpl/'),
                     'lang':             path.join(appRoot, '/core/shared/lang/'),