stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-22 01:19:54 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Respect the "theme" variable if we're an admin. This requires us to

Browse Source 
change the order of operations in gallery_event::gallery_ready() so
that we load users before themes.  Fixes ticket #836.
This commit is contained in:
Bharat Mediratta
2009-11-03 14:03:36 -08:00
parent f9b700e75c
commit 96cbfe23a6
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/gallery/helpers/theme.php
View File

@@ -30,13 +30,16 @@ class theme_Core {
*/
static function load_themes() {
$path = Input::instance()->server("PATH_INFO");
$input = Input::instance();
if (empty($path)) {
$path = "/" . Input::instance()->get("kohana_uri");
$path = "/" . $input->get("kohana_uri");
}
$theme_name = module::get_var(
"gallery",
!strncmp($path, "/admin", 6) ? "active_admin_theme" : "active_site_theme");
if (!(identity::active_user()->admin && $theme_name = $input->get("theme"))) {
$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);