diff options
author | Bharat Mediratta <bharat@menalto.com> | 2011-08-08 20:28:31 -0700 |
---|---|---|
committer | Bharat Mediratta <bharat@menalto.com> | 2011-08-08 21:29:19 -0700 |
commit | da523de77727a3d529a88b8ca1abec5ec4d2a4cc (patch) | |
tree | 09b027a42a13f464d0c88a29c548654dd60bd908 /modules/search | |
parent | 8fd319918b8cafb48781fee02d2075473eb42267 (diff) |
Simplification of 59b04b897b8a664cd7334b017fac8158a6281434 for #1764:
- Breadcrumb::build_from_item becomes Breadcrumb::array_from_item_parents
- Eliminate Breadcrumb::$id -- it's no longer necessary
- Fold Breadcrumb::generate_show_query_strings into Breadcrumb::array_from_item_parents
- Create Breadcrumb::set_first() and Breadcrumb::set_last()
- Breadcrumb::build_from_list goes away, we just use arrays for this
- Change Search_Controller and Tag_Controller to just create an array
of Breadcrumb instances with the first/last marked appropriately
- Breadcrumb_Test loses a bunch of complexity.
Diffstat (limited to 'modules/search')
-rw-r--r-- | modules/search/controllers/search.php | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/modules/search/controllers/search.php b/modules/search/controllers/search.php index d30ffa67..5db63ab0 100644 --- a/modules/search/controllers/search.php +++ b/modules/search/controllers/search.php @@ -37,14 +37,15 @@ class Search_Controller extends Controller { $template = new Theme_View("page.html", "collection", "search"); $root = item::root(); - $search_url = url::abs_site("search?q=" . urlencode($q)); - $template->set_global(array("page" => $page, - "max_pages" => $max_pages, - "page_size" => $page_size, - "breadcrumbs" => Breadcrumb::build_from_list( - new Breadcrumb(item::root()->title, "/", item::root()->id), - new Breadcrumb($q, $search_url)), - "children_count" => $count)); + $template->set_global( + array("page" => $page, + "max_pages" => $max_pages, + "page_size" => $page_size, + "breadcrumbs" => array( + Breadcrumb::instance($root->title, $root->url())->set_first(), + Breadcrumb::instance($q, url::abs_site("search?q=" . urlencode($q)))->set_last(), + ), + "children_count" => $count)); $template->content = new View("search.html"); $template->content->items = $result; |