Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev

Conflicts:
	modules/gallery/helpers/theme.php
	modules/gallery/libraries/Admin_View.php
	modules/gallery/libraries/Theme_View.php

1 files changed, 7 insertions, 6 deletions

diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 03f67671..f78a7018 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -29,12 +29,6 @@ class Theme_View_Core extends Gallery_View {
    * @return  void
    */
   public function __construct($name, $page_type, $page_subtype) {
-    $theme_name = module::get_var("gallery", "active_site_theme");
-    if (!file_exists(THEMEPATH . $theme_name)) {
-      module::set_var("gallery", "active_site_theme", "wind");
-      theme::load_themes();
-      Kohana_Log::add("error", "Unable to locate theme '$theme_name', switching to default theme.");
-    }
     parent::__construct($name);
 
     $this->theme_name = module::get_var("gallery", "active_site_theme");
@@ -271,6 +265,13 @@ class Theme_View_Core extends Gallery_View {
         }
       }
 
+      $helper_class = theme::$site_theme_name . "_theme";
+      if (method_exists($helper_class, $function)) {
+        $blocks[] = call_user_func_array(
+          array($helper_class, $function),
+          array_merge(array($this), $args));
+      }
+
       if ($function == "head") {
         array_unshift($blocks, $this->combine_files($this->css, "css"));
         array_unshift($blocks, $this->combine_files($this->scripts, "javascript"));