From 6f1c46da6e0fb0145412d18412ffb593f5bd9b5a Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Thu, 6 Nov 2008 10:22:34 +0000 Subject: Oops, these files got left out of r18525. --- core/controllers/album.php | 4 +++- core/controllers/photo.php | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'core/controllers') diff --git a/core/controllers/album.php b/core/controllers/album.php index 2b1ad067..abe9039a 100644 --- a/core/controllers/album.php +++ b/core/controllers/album.php @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class Album_Controller extends Template_Controller { - public $template = "album.html"; + public $template = "page.html"; public function View($id) { $item = ORM::factory("item")->where("id", $id)->find(); @@ -26,6 +26,8 @@ class Album_Controller extends Template_Controller { return Kohana::show_404(); } + $this->template->content = new View("album.html"); + $this->template->set_global('item', $item); $this->template->set_global('children', $item->children()); $this->template->set_global('parents', $item->parents()); diff --git a/core/controllers/photo.php b/core/controllers/photo.php index 4c0ab975..6f746e65 100644 --- a/core/controllers/photo.php +++ b/core/controllers/photo.php @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class Photo_Controller extends Template_Controller { - public $template = "photo.html"; + public $template = "page.html"; public function View($id) { $item = ORM::factory("item")->where("id", $id)->find(); @@ -26,6 +26,8 @@ class Photo_Controller extends Template_Controller { return Kohana::show_404(); } + $this->template->content = new View("photo.html"); + $this->template->set_global('item', $item); $this->template->set_global('children', $item->children()); $this->template->set_global('parents', $item->parents()); -- cgit v1.2.3