Refactor the display context code a bit:

1) Move the display context code into the controller themselves so that it's
   more logically a continuation callback from the original controller
   rendering code.
2) Simplify the display context set/get code and put it in the item helper,
   it's just a couple of lines of code now.
3) Add more descriptive breadcrumb strings

1 files changed, 4 insertions, 6 deletions

diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 49bb5a25..7e78b205 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -28,12 +28,10 @@ class Photos_Controller extends Items_Controller {
     access::required("view", $photo);
 
     $template = new Theme_View("page.html", "item", "photo");
-    $template->set_global(
-      array_merge(array("item" => $photo,
-                        "children" => array(),
-                        "children_count" => 0),
-                  Display_Context::factory()->display_context($photo)));
-
+    $template->set_global(array("item" => $photo,
+                                "children" => array(),
+                                "children_count" => 0));
+    $template->set_global(item::get_display_context($photo));
     $template->content = new View("photo.html");
 
     $photo->increment_view_count();