Merge remote-tracking branch 'upstream/pull/5410'

[rails.git] / lib / classic_pagination / pagination_helper.rb

diff --git a/lib/classic_pagination/pagination_helper.rb b/lib/classic_pagination/pagination_helper.rb
index 72d16fc983cdbfd80b28201f1ce9b239c1b3b939..c450de4e149b6cff38bb3ab3a787789dd3ccc725 100644 (file)
--- a/lib/classic_pagination/pagination_helper.rb
+++ b/lib/classic_pagination/pagination_helper.rb
@@ -145,7 +145,7 @@ module ActionView
         items = []
 
         if always_show_anchors && !(wp_first = window_pages[0]).first?
         items = []
 
         if always_show_anchors && !(wp_first = window_pages[0]).first?

-          items.push [first.number.to_s, first.number]
+          items.push [first.number.to_s, first]

           items.push ["...", "disabled"] if wp_first.number - first.number > 1
         end
 
           items.push ["...", "disabled"] if wp_first.number - first.number > 1
         end
 


@@ -153,13 +153,13 @@ module ActionView
           if current_page == page && !link_to_current_page
             items.push [page.number.to_s, "active"]
           else
           if current_page == page && !link_to_current_page
             items.push [page.number.to_s, "active"]
           else

-            items.push [page.number.to_s, page.number]
+            items.push [page.number.to_s, page]

           end
         end
 
         if always_show_anchors && !(wp_last = window_pages[-1]).last?
           items.push ["...", "disabled"] if last.number - wp_last.number > 1
           end
         end
 
         if always_show_anchors && !(wp_last = window_pages[-1]).last?
           items.push ["...", "disabled"] if last.number - wp_last.number > 1

-          items.push [last.number.to_s, last.number]
+          items.push [last.number.to_s, last]

         end
 
         items
         end
 
         items