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

1 files changed, 11 insertions, 6 deletions

diff --git a/modules/tag/controllers/tag.php b/modules/tag/controllers/tag.php
index 8f885dea..7786daa1 100644
--- a/modules/tag/controllers/tag.php
+++ b/modules/tag/controllers/tag.php
@@ -34,13 +34,18 @@ class Tag_Controller extends Controller {
       url::redirect(url::merge(array("page" => $max_pages)));
     }
 
+    $root = item::root();
     $template = new Theme_View("page.html", "collection", "tag");
-    $template->set_global(array("page" => $page,
-                                "max_pages" => $max_pages,
-                                "page_size" => $page_size,
-                                "tag" => $tag,
-                                "children" => $tag->items($page_size, $offset),
-                                "children_count" => $children_count));
+    $template->set_global(
+      array("page" => $page,
+            "max_pages" => $max_pages,
+            "page_size" => $page_size,
+            "tag" => $tag,
+            "children" => $tag->items($page_size, $offset),
+            "breadcrumbs" => array(
+              Breadcrumb::instance($root->title, $root->url())->set_first(),
+              Breadcrumb::instance($tag->name, $tag->url())->set_last()),
+            "children_count" => $children_count));
     $template->content = new View("dynamic.html");
     $template->content->title = t("Tag: %tag_name", array("tag_name" => $tag->name));