From e84aa77237bda6ff39c1bbd1af93d704f54d8b38 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 22 Feb 2009 00:57:54 +0000 Subject: Fix load_themes() to actually look up the right themes to use. Thanks to Blake Turner. --- core/helpers/theme.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/helpers/theme.php b/core/helpers/theme.php index 322468d5..596bfa2a 100644 --- a/core/helpers/theme.php +++ b/core/helpers/theme.php @@ -31,9 +31,9 @@ class theme_Core { static function load_themes() { $modules = Kohana::config("core.modules"); if (Router::$controller == "admin") { - array_unshift($modules, THEMEPATH . "admin_default"); + array_unshift($modules, THEMEPATH . module::get_var("core", "active_admin_theme")); } else { - array_unshift($modules, THEMEPATH . "default"); + array_unshift($modules, THEMEPATH . module::get_var("core", "active_site_theme")); } Kohana::config_set("core.modules", $modules); } -- cgit v1.2.3