Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev

1 files changed, 5 insertions, 3 deletions

diff --git a/modules/gallery/controllers/items.php b/modules/gallery/controllers/items.php
index 86782469..f261e3a9 100644
--- a/modules/gallery/controllers/items.php
+++ b/modules/gallery/controllers/items.php
@@ -23,10 +23,12 @@ class Items_Controller extends Controller {
     if (!$item->loaded()) {
       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
-    // to have a single canonical resource mapping.
+    // differently.  We can't delegate here because we may have gotten to this
+    // page via /items/<id> which means that we don't have a type-specific controller.  Also, we
+    // want to drive a single canonical resource mapping where possible.
     access::required("view", $item);
-    return $this->_show($item);
+    url::redirect($item->abs_url());
   }
 }