diff options
| -rw-r--r-- | modules/gallery/helpers/gallery_event.php | 4 | ||||
| -rw-r--r-- | modules/gallery/helpers/theme.php | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php index d45f5316..2c9d496a 100644 --- a/modules/gallery/helpers/gallery_event.php +++ b/modules/gallery/helpers/gallery_event.php @@ -23,8 +23,8 @@ class gallery_event_Core { * Initialization. */ static function gallery_ready() { - theme::load_themes(Input::instance()->server("PATH_INFO")); - user::load_user(); + theme::load_themes(); + identity::load_user(); locales::set_request_locale(); } diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php index 5588fbce..64e919e3 100644 --- a/modules/gallery/helpers/theme.php +++ b/modules/gallery/helpers/theme.php @@ -28,13 +28,17 @@ 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($path) { - $modules = Kohana::config("core.modules"); - 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")); + static function load_themes() { + $path = Input::instance()->server("PATH_INFO"); + if (empty($path)) { + $path = "/" . Input::instance()->get("kohana_uri"); } + + $theme_name = module::get_var( + "gallery", + !strncmp($path, "/admin", 6) ? "active_admin_theme" : "active_site_theme"); + $modules = Kohana::config("core.modules"); + array_unshift($modules, THEMEPATH . $theme_name); Kohana::config_set("core.modules", $modules); } |