Git pull from devel line.

1 files changed, 8 insertions, 8 deletions

diff --git a/modules/tag/controllers/tag.php b/modules/tag/controllers/tag.php
index 0e924f3d..47110540 100644
--- a/modules/tag/controllers/tag.php
+++ b/modules/tag/controllers/tag.php
@@ -29,18 +29,18 @@ class Tag_Controller extends Controller {
 
     // Make sure that the page references a valid offset
     if ($page < 1) {
-      url::redirect($album->abs_url());
+      url::redirect(url::merge(array("page" => 1)));
     } else if ($page > $max_pages) {
-      url::redirect($album->abs_url("page=$max_pages"));
+      url::redirect(url::merge(array("page" => $max_pages)));
     }
 
     $template = new Theme_View("page.html", "collection", "tag");
-    $template->set_global("page", $page);
-    $template->set_global("max_pages", $max_pages);
-    $template->set_global("page_size", $page_size);
-    $template->set_global("tag", $tag);
-    $template->set_global("children", $tag->items($page_size, $offset));
-    $template->set_global("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),
+                                "children_count" => $children_count));
     $template->content = new View("dynamic.html");
     $template->content->title = t("Tag: %tag_name", array("tag_name" => $tag->name));