Merge branch 'master' of github.com:gallery/gallery3

gallery · Jun 26, 2010 · 87d09bc · 87d09bc
2 parents 8bc7eec + 8ecf28d
commit 87d09bc
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php
@@ -53,6 +53,15 @@ static function load_themes() {
       if (file_exists(THEMEPATH . self::$site_theme_name . "/admin")) {
         array_unshift($modules, THEMEPATH . self::$site_theme_name . "/admin");
       }
+      // Admins can override the site theme, temporarily.  This lets us preview themes.
+      if (identity::active_user()->admin && $override = $input->get("theme")) {
+        if (file_exists(THEMEPATH . $override)) {
+          self::$admin_theme_name = $override;
+          array_unshift($modules, THEMEPATH . self::$admin_theme_name);
+        } else {
+          Kohana_Log::add("error", "Missing override theme: '$override'");
+        }
+      }
     } else {
       // Admins can override the site theme, temporarily.  This lets us preview themes.
       if (identity::active_user()->admin && $override = $input->get("theme")) {