diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-03 15:51:24 +0000 | 
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-03 15:51:24 +0000 | 
| commit | 399abbc3a754cf5fdcfdff113446e1bc264091e2 (patch) | |
| tree | 592188568e15325d59e51bf19cfdf667fae8d86d /modules/gallery/controllers/items.php | |
| parent | 925a6a2220760cb7daacee1ab80a07b61b3a30a1 (diff) | |
| parent | 64e5efd57ba1479179c202e1b76b6eeb42d2924c (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery/controllers/items.php')
| -rw-r--r-- | modules/gallery/controllers/items.php | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/modules/gallery/controllers/items.php b/modules/gallery/controllers/items.php index b350c5a2..f261e3a9 100644 --- a/modules/gallery/controllers/items.php +++ b/modules/gallery/controllers/items.php @@ -20,8 +20,8 @@  class Items_Controller extends Controller {    public function __call($function, $args) {      $item = ORM::factory("item", (int)$function); -    if (!$item->loaded) { -      return Kohana::show_404(); +    if (!$item->loaded()) { +      throw new Kohana_404_Exception();      }      // Redirect to the more specific resource type, since it will render | 
