Change admin/themes to show both styles of themes side by side. This

eliminates the menu, which is kind of clunky.

While I'm at it, let's call the "regular" themes a "site theme" so we
have "site" and "admin" themes.

1 files changed, 1 insertions, 1 deletions

diff --git a/core/libraries/Theme_View.php b/core/libraries/Theme_View.php
index 64023aa6..38e8e056 100644
--- a/core/libraries/Theme_View.php
+++ b/core/libraries/Theme_View.php
@@ -32,7 +32,7 @@ class Theme_View_Core extends View {
   public function __construct($name, $page_type) {
     parent::__construct($name);
 
-    $this->theme_name = module::get_var("core", "active_theme");
+    $this->theme_name = module::get_var("core", "active_site_theme");
     if (user::active()->admin) {
       $this->theme_name = Input::instance()->get("theme", $this->theme_name);
     }