Merge pull request #1028 from eMxyzptlk/fix_will_paginate

Fix for will_paginate version 3.0.1
refinery · Sep 22, 2011 · b1692ad · b1692ad
2 parents eaeb741 + 2260de0
commit b1692ad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/core/config/initializers/will_paginate_monkeypatch.rb b/core/config/initializers/will_paginate_monkeypatch.rb
@@ -3,9 +3,8 @@ module ActionView
     class LinkRenderer < ViewHelpers::LinkRenderer
       def url(page)
         @base_url_params ||= begin
-          url_params = base_url_params
+          url_params = merge_get_params(default_url_params)
           merge_optional_params(url_params)
-          url_params
         end
 
         url_params = @base_url_params.dup
@@ -15,4 +14,4 @@ def url(page)
       end
     end
   end
-end
+end
diff --git a/core/lib/gemspec.rb b/core/lib/gemspec.rb
@@ -29,7 +29,7 @@
   s.add_dependency 'awesome_nested_set',          '~> 2.0'
   s.add_dependency 'rails',                       '>= 3.1.1.rc1'
   s.add_dependency 'truncate_html',               '~> 0.5'
-  s.add_dependency 'will_paginate',               '~> 3.0'
+  s.add_dependency 'will_paginate',               '~> 3.0.1'
   s.add_dependency 'sass-rails',                  '~> 3.1.0'
   s.add_dependency 'coffee-rails',                '~> 3.1.0'
   s.add_dependency 'uglifier'

diff --git a/core/refinerycms-core.gemspec b/core/refinerycms-core.gemspec
@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version           = %q{2.0.0}
   s.summary           = %q{Core engine for Refinery CMS}
   s.description       = %q{The core of Refinery CMS. This handles the common functionality and is required by most engines}
-  s.date              = %q{2011-09-20}
+  s.date              = %q{2011-09-22}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'awesome_nested_set',          '~> 2.0'
   s.add_dependency 'rails',                       '>= 3.1.1.rc1'
   s.add_dependency 'truncate_html',               '~> 0.5'
-  s.add_dependency 'will_paginate',               '~> 3.0'
+  s.add_dependency 'will_paginate',               '~> 3.0.1'
   s.add_dependency 'sass-rails',                  '~> 3.1.0'
   s.add_dependency 'coffee-rails',                '~> 3.1.0'
   s.add_dependency 'uglifier'