From 4a417708f00b1ebd5865c8075bb36b7fc0f14756 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 25 Nov 2009 13:49:40 -0800
Subject: [PATCH] Kohana::show_404() -> throw new Kohana_404_Exception()

---
 modules/digibug/controllers/digibug.php                     | 6 +++---
 modules/gallery/controllers/combined.php                    | 4 ++--
 modules/gallery/controllers/items.php                       | 2 +-
 modules/gallery_unit_test/controllers/gallery_unit_test.php | 2 +-
 modules/rss/controllers/rss.php                             | 2 +-
 modules/tag/helpers/tag_rss.php                             | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index cef42b2d..25f1ca3e 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -61,7 +61,7 @@ class Digibug_Controller extends Controller {
     if ($type == "full") {
       $remote_addr = ip2long($this->input->server("REMOTE_ADDR"));
       if ($remote_addr === false) {
-        Kohana::show_404();
+        throw new Kohana_404_Exception();
       }
       $config = Kohana::config("digibug");
 
@@ -76,13 +76,13 @@ class Digibug_Controller extends Controller {
         }
       }
       if (!$authorized) {
-        Kohana::show_404();
+        throw new Kohana_404_Exception();
       }
     }
 
     $proxy = ORM::factory("digibug_proxy", array("uuid" => $id));
     if (!$proxy->loaded() || !$proxy->item->loaded()) {
-      Kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     $file = $type == "full" ? $proxy->item->file_path() : $proxy->item->thumb_path();
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
diff --git a/modules/gallery_unit_test/controllers/gallery_unit_test.php b/modules/gallery_unit_test/controllers/gallery_unit_test.php
index 58e0d9c5..391ad029 100644
--- a/modules/gallery_unit_test/controllers/gallery_unit_test.php
+++ b/modules/gallery_unit_test/controllers/gallery_unit_test.php
@@ -20,7 +20,7 @@
 class Gallery_Unit_Test_Controller extends Controller {
   function Index() {
     if (!TEST_MODE) {
-      print Kohana::show_404();
+      print throw new Kohana_404_Exception();
     }
 
     // Jump through some hoops to satisfy the way that we check for the site_domain in
diff --git a/modules/rss/controllers/rss.php b/modules/rss/controllers/rss.php
index ed2acef8..a963a1dc 100644
--- a/modules/rss/controllers/rss.php
+++ b/modules/rss/controllers/rss.php
@@ -39,7 +39,7 @@ class Rss_Controller extends Controller {
       }
     }
     if (empty($feed)) {
-      Kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     if ($feed->max_pages && $page > $feed->max_pages) {
diff --git a/modules/tag/helpers/tag_rss.php b/modules/tag/helpers/tag_rss.php
index 03017dc3..f09a4530 100644
--- a/modules/tag/helpers/tag_rss.php
+++ b/modules/tag/helpers/tag_rss.php
@@ -32,7 +32,7 @@ class tag_rss_Core {
     if ($feed_id == "tag") {
       $tag = ORM::factory("tag", $id);
       if (!$tag->loaded()) {
-        Kohana::show_404();
+        throw new Kohana_404_Exception();
       }
       $feed->children = $tag->items($limit, $offset, "photo");
       $feed->max_pages = ceil($tag->count / $limit);