Normalize our Admin controllers so that functions always print out

their results, as opposed to having them return their view back
upstream.  This is a little more code in every controller, but it's
much less magical and more consistent.

Look up the active_theme and active_admin_theme inside the view
itself, no need to do that in the controllers.  This makes view
initialization easier in the controllers.

1 files changed, 1 insertions, 2 deletions

diff --git a/core/controllers/albums.php b/core/controllers/albums.php
index 8d2b5b77..08b61058 100644
--- a/core/controllers/albums.php
+++ b/core/controllers/albums.php
@@ -25,7 +25,6 @@ class Albums_Controller extends Items_Controller {
   public function _show($album) {
     access::required("view", $album);
 
-    $theme_name = module::get_var("core", "active_theme", "default");
     $page_size = module::get_var("core", "page_size", 9);
     $page = $this->input->get("page", "1");
     $children_count = $album->viewable()->children_count();
@@ -36,7 +35,7 @@ class Albums_Controller extends Items_Controller {
       Kohana::show_404();
     }
 
-    $template = new Theme_View("page.html", "album", $theme_name);
+    $template = new Theme_View("page.html", "album");
     $template->set_global("page_size", $page_size);
     $template->set_global("item", $album);
     $template->set_global("children", $album->viewable()->children($page_size, $offset));