Use page parameter instead of p for pagination.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10744 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 9c6a4cf20484780d77af6c105ea3ed3800885804..063a91ef82bba20801591c08ade1be7cf9ca56aa 100644 (file)
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -220,7 +220,7 @@ class WikiController < ApplicationController
   # show page history
   def history
     @version_count = @page.content.versions.count
-    @version_pages = Paginator.new self, @version_count, per_page_option, params['p']
+    @version_pages = Paginator.new self, @version_count, per_page_option, params['page']
     # don't load text
     @versions = @page.content.versions.find :all,
                                             :select => "id, author_id, comments, updated_on, version",

diff --git a/app/views/wiki/history.html.erb b/app/views/wiki/history.html.erb
index b03af266ac72068635f6f60d2db61c6a87d50680..90ce353dff8c753623d8bbcfcf91f102f9d2996c 100644 (file)
--- a/app/views/wiki/history.html.erb
+++ b/app/views/wiki/history.html.erb
@@ -38,5 +38,5 @@
 </tbody>
 </table>
 <%= submit_tag l(:label_view_diff), :class => 'small' if show_diff %>
-<span class="pagination"><%= pagination_links_full @version_pages, @version_count, :page_param => :p %></span>
+<span class="pagination"><%= pagination_links_full @version_pages, @version_count %></span>
 <% end %>