1 files changed, 29 insertions, 7 deletions

diff --git a/modules/search/controllers/search.php b/modules/search/controllers/search.php
index 1d5a55bf..e4ac6702 100644
--- a/modules/search/controllers/search.php
+++ b/modules/search/controllers/search.php
@@ -29,7 +29,7 @@ class Search_Controller extends Controller {
       $index = search::get_position($child, $q_with_more_terms);
       if ($index) {
         $page = ceil($index / $page_size);
-        url::redirect( url::abs_site("search?q=" . urlencode($q) . ($page == 1 ? "" : "&page=$page")));
+        url::redirect(url::abs_site("search?q=" . urlencode($q) . ($page == 1 ? "" : "&page=$page")));
       }
     }
 
@@ -48,12 +48,6 @@ class Search_Controller extends Controller {
 
     $max_pages = max(ceil($count / $page_size), 1);
 
-    Display_Context::factory("search")
-      ->set(array("title" => $title,
-                  "query_terms" => $q_with_more_terms,
-                  "q" => $q))
-      ->save();
-
     $template = new Theme_View("page.html", "collection", "search");
     $root = item::root();
     $template->set_global(
@@ -71,5 +65,33 @@ class Search_Controller extends Controller {
     $template->content->q = $q;
 
     print $template;
+
+    item::set_display_context_callback(
+      "Search_Controller::get_display_context", $title, $q_with_more_terms, $q);
+  }
+
+  static function get_display_context($item, $title, $query_terms, $q) {
+    $position = search::get_position($item, $query_terms);
+
+    if ($position > 1) {
+      list ($count, $result_data) = search::search($query_terms, 3, $position - 2);
+      list ($previous_item, $ignore, $next_item) = $result_data;
+    } else {
+      $previous_item = null;
+      list ($count, $result_data) = search::search($query_terms, 1, $position);
+      list ($next_item) = $result_data;
+    }
+
+    $search_url = url::abs_site("search?q=" . urlencode($q) . "&show={$item->id}");
+    $root = item::root();
+
+    return array("position" => $position,
+                 "previous_item" => $previous_item,
+                 "next_item" => $next_item,
+                 "sibling_count" => $count,
+                 "breadcrumbs" => array(
+                   Breadcrumb::instance($root->title, "/", $root->id)->set_first(),
+                   Breadcrumb::instance(t("Search: %q", array("q" => $q)), $search_url),
+                   Breadcrumb::instance($item->title, $item->url())->set_last()));
   }
 }