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, 0 insertions, 6 deletions

diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index c190f110..a990e4ca 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -27,12 +27,6 @@ class Admin_View_Core extends Gallery_View {
    * @return  void
    */
   public function __construct($name) {
-    $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::add("error", "Unable to locate theme '$theme_name', switching to default theme.");
-    }
     parent::__construct($name);
 
     $this->theme_name = module::get_var("gallery", "active_admin_theme");