Merging 17905:17944 from trunk.

[rails.git] / app / views / changeset / _changeset_paging_nav.html.erb

diff --git a/app/views/changeset/_changeset_paging_nav.html.erb b/app/views/changeset/_changeset_paging_nav.html.erb
index 94edfc31ed1f673aceba4fe62a5c50431fb8b449..5a5d94f05d89a670a739111f0180517926dc5e18 100644 (file)
--- a/app/views/changeset/_changeset_paging_nav.html.erb
+++ b/app/views/changeset/_changeset_paging_nav.html.erb
@@ -7,14 +7,7 @@ if (current_page.first_item < current_page.last_item) # if more than 1 changeset
   %>-<%= current_page.last_item %><% 
 end %>
 <%= t'changeset.changeset_paging_nav.of'%> <%= @edit_pages.item_count %>)
-
-<%
-if @edit_pages.page_count > 1 
-       bboxparam = h(params['bbox'])
-       bboxparam = nil if bboxparam==""
-%>
- | <%= pagination_links_each(@edit_pages, {}) { |n| link_to(n,  :display_name => @display_name, :bbox => bboxparam , :page => n) }  %>
-<%
-end
-%>
+<% if @edit_pages.page_count > 1 %>
+ | <%= pagination_links_each(@edit_pages, {}) { |n| link_to(n, params.merge({ :page => n })) } %>
+<% end %>
 </p>