Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/helpers/gallery_event.php

3 files changed, 4 insertions, 5 deletions

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index b6afa2c8..91f3e717 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -23,7 +23,8 @@ class gallery_event_Core {
    * Initialization.
    */
   static function gallery_ready() {
-    identity::load_user();
+    theme::load_themes(Input::instance()->server("PATH_INFO"));
+    user::load_user();
     locales::set_request_locale();
   }
 
diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php
index fb8f7ca7..5588fbce 100644
--- a/modules/gallery/helpers/theme.php
+++ b/modules/gallery/helpers/theme.php
@@ -28,14 +28,13 @@ class theme_Core {
    * Load the active theme.  This is called at bootstrap time.  We will only ever have one theme
    * active for any given request.
    */
-  static function load_themes() {
+  static function load_themes($path) {
     $modules = Kohana::config("core.modules");
-    if (Router::$controller == "admin") {
+    if (strpos($path, "/admin") === 0) {
       array_unshift($modules, THEMEPATH . module::get_var("gallery", "active_admin_theme"));
     } else {
       array_unshift($modules, THEMEPATH . module::get_var("gallery", "active_site_theme"));
     }
-
     Kohana::config_set("core.modules", $modules);
   }
 
diff --git a/modules/gallery/hooks/init_gallery.php b/modules/gallery/hooks/init_gallery.php
index da7eeb0f..b2d9c4de 100644
--- a/modules/gallery/hooks/init_gallery.php
+++ b/modules/gallery/hooks/init_gallery.php
@@ -27,7 +27,6 @@ if (!file_exists(VARPATH . "database.php")) {
 Event::add("system.ready", array("I18n", "instance"));
 Event::add("system.ready", array("module", "load_modules"));
 Event::add("system.ready", array("gallery", "ready"));
-Event::add("system.post_routing", array("theme", "load_themes"));
 Event::add("system.post_routing", array("url", "parse_url"));
 Event::add("system.post_routing", array("gallery", "maintenance_mode"));
 Event::add("system.shutdown", array("gallery", "shutdown"));