summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-10-28 20:27:50 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-10-28 20:27:50 +0000
commitfe690dcf20cb5c7ec6c9ed222bf88c51fdbc30eb (patch)
treed3d9a17f339590547ef462bc3c1f378e26ab5a52 /app
parentbeb2610650595d4333fa88eb648146a6a26ad761 (diff)
downloadredmine-fe690dcf20cb5c7ec6c9ed222bf88c51fdbc30eb.tar.gz
redmine-fe690dcf20cb5c7ec6c9ed222bf88c51fdbc30eb.zip
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
Diffstat (limited to 'app')
-rw-r--r--app/controllers/wiki_controller.rb2
-rw-r--r--app/views/wiki/history.html.erb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 9c6a4cf20..063a91ef8 100644
--- 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 b03af266a..90ce353df 100644
--- 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 %>