From 4a417708f00b1ebd5865c8075bb36b7fc0f14756 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Wed, 25 Nov 2009 13:49:40 -0800 Subject: Kohana::show_404() -> throw new Kohana_404_Exception() --- modules/gallery/controllers/combined.php | 4 ++-- modules/gallery/controllers/items.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/gallery/controllers') diff --git a/modules/gallery/controllers/combined.php b/modules/gallery/controllers/combined.php index c1f42bfe..8132fc41 100644 --- a/modules/gallery/controllers/combined.php +++ b/modules/gallery/controllers/combined.php @@ -56,7 +56,7 @@ class Combined_Controller extends Controller { } if (empty($key)) { - Kohana::show_404(); + throw new Kohana_404_Exception(); } $cache = Cache::instance(); @@ -71,7 +71,7 @@ class Combined_Controller extends Controller { $content = $cache->get($key); } if (empty($content)) { - Kohana::show_404(); + throw new Kohana_404_Exception(); } // $type is either 'javascript' or 'css' diff --git a/modules/gallery/controllers/items.php b/modules/gallery/controllers/items.php index bf1f80d4..86782469 100644 --- a/modules/gallery/controllers/items.php +++ b/modules/gallery/controllers/items.php @@ -21,7 +21,7 @@ class Items_Controller extends Controller { public function __call($function, $args) { $item = ORM::factory("item", (int)$function); if (!$item->loaded()) { - return Kohana::show_404(); + throw new Kohana_404_Exception(); } // Redirect to the more specific resource type, since it will render // differently. We could also just delegate here, but it feels more appropriate -- cgit v1.2.3