Permalink
Browse files

Merb views: go back to using url(:this), but preserve other params ex…

…plicitly
  • Loading branch information...
1 parent d835e46 commit 9aa6046bec34e935256cd44b065341f51d37284b @mislav mislav committed Nov 10, 2008
Showing with 2 additions and 6 deletions.
  1. +2 −6 lib/will_paginate/view_helpers/merb.rb
@@ -5,12 +5,8 @@
protected
def url(page)
- if @options[:base_url]
- "#{@options[:base_url]}?#{param_name}=#{page}"
- else
- # soon to be replaced by @template.url(:this, :page => page)
- @template.url(@template.request.route.name, @template.request.params.except(:action, :controller).merge(:page => page))
- end
+ params = @template.request.params.except(:action, :controller).merge(:page => page)
+ @template.url(:this, params)
end
end

0 comments on commit 9aa6046

Please sign in to comment.