diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-09-24 15:06:40 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-09-24 15:06:40 -0700 |
| commit | c51c76dcaa41085eb5cb7a1a0299bb378a175372 (patch) | |
| tree | a4cb27cf2542023afde801194669f914c6507980 /modules | |
| parent | 59c1c36639af36b3b9ec99664402f9501c290a40 (diff) | |
Fix Admin_View to look for the the variable active_admin_theme instead of active_site_theme. In addition check for the existence of THEMEPATH . instead of theme/
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gallery/libraries/Admin_View.php | 6 | ||||
| -rw-r--r-- | modules/gallery/libraries/Theme_View.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php index a516a1ae..fd4fbea8 100644 --- a/modules/gallery/libraries/Admin_View.php +++ b/modules/gallery/libraries/Admin_View.php @@ -27,9 +27,9 @@ class Admin_View_Core extends Gallery_View { * @return void */ public function __construct($name) { - $theme_name = module::get_var("gallery", "active_site_theme"); - if (!file_exists("themes/$theme_name")) { - module::set_var("gallery", "active_site_theme", "admin_wind"); + $theme_name = module::get_var("gallery", "active_admin_theme"); + if (!file_exists(THEMEPATH . $theme_name)) { + module::set_var("gallery", "active_admin_theme", "admin_wind"); theme::load_themes(); Kohana::log("error", "Unable to locate theme '$theme_name', switching to default theme."); } diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php index 01d6a61b..ebd6a920 100644 --- a/modules/gallery/libraries/Theme_View.php +++ b/modules/gallery/libraries/Theme_View.php @@ -29,7 +29,7 @@ class Theme_View_Core extends Gallery_View { */ public function __construct($name, $page_type) { $theme_name = module::get_var("gallery", "active_site_theme"); - if (!file_exists("themes/$theme_name")) { + if (!file_exists(THEMEPATH . $theme_name)) { module::set_var("gallery", "active_site_theme", "wind"); theme::load_themes(); Kohana::log("error", "Unable to locate theme '$theme_name', switching to default theme."); |