summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-02-22 00:57:54 +0000
committerBharat Mediratta <bharat@menalto.com>2009-02-22 00:57:54 +0000
commite84aa77237bda6ff39c1bbd1af93d704f54d8b38 (patch)
tree06ee19dff8e022ac81c411c9668108e3b959b91d
parent2505bd157932a369cc006dd8fc0dd80b57b22b69 (diff)
Fix load_themes() to actually look up the right themes to use. Thanks to Blake Turner.
-rw-r--r--core/helpers/theme.php4
1 files changed, 2 insertions, 2 deletions
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);
}