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.

1 files changed, 2 insertions, 5 deletions

diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php
index fb8f7ca7..3ba11aa2 100644
--- a/modules/gallery/helpers/theme.php
+++ b/modules/gallery/helpers/theme.php
@@ -30,11 +30,8 @@ class theme_Core {
    */
   static function load_themes() {
     $modules = Kohana::config("core.modules");
-    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"));
-    }
+    array_unshift($modules, gallery::plugin_path(module::get_var("gallery",
+      (Router::$controller == "admin") ? "active_admin_theme" : "active_site_theme"), "theme"));
 
     Kohana::config_set("core.modules", $modules);
   }