From 2634a683b30982963264faf9867d32d1aa71a182 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Sun, 4 Oct 2009 10:04:35 -0700 Subject: Revert "Create a gallery::plugin_path which returns the appropriate path to the module or theme. This checks for the existence of an application/modules or application/themes first." This reverts commit e1e1461a77caf5bff457927f098366497de6ffff. --- modules/gallery/helpers/theme.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'modules/gallery/helpers/theme.php') diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php index 3ba11aa2..fb8f7ca7 100644 --- a/modules/gallery/helpers/theme.php +++ b/modules/gallery/helpers/theme.php @@ -30,8 +30,11 @@ class theme_Core { */ static function load_themes() { $modules = Kohana::config("core.modules"); - array_unshift($modules, gallery::plugin_path(module::get_var("gallery", - (Router::$controller == "admin") ? "active_admin_theme" : "active_site_theme"), "theme")); + if (Router::$controller == "admin") { + 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); } -- cgit v1.2.3