diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2009-10-23 22:28:40 -0600 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2009-10-23 22:28:40 -0600 |
| commit | e13f92abab2cef2d58cc4e560e18aa65c138a264 (patch) | |
| tree | e30807ca5c91a181912b746c0d89cd321ec5ee8b /modules/gallery | |
| parent | bb47b495a7d719ee679e4747e9fd5b8f7c39b58a (diff) | |
| parent | 5fb0434a478051f77ab241f62656ad941225c397 (diff) | |
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery')
| -rw-r--r-- | modules/gallery/helpers/gallery_event.php | 1 | ||||
| -rw-r--r-- | modules/gallery/helpers/theme.php | 5 | ||||
| -rw-r--r-- | modules/gallery/hooks/init_gallery.php | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php index e0de2152..d45f5316 100644 --- a/modules/gallery/helpers/gallery_event.php +++ b/modules/gallery/helpers/gallery_event.php @@ -23,6 +23,7 @@ class gallery_event_Core { * Initialization. */ static function gallery_ready() { + 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")); |