From c327653394f6ce9fe9e6cbd818ca9d3fe4648050 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Mon, 14 Jan 2013 16:38:33 -0500
Subject: [PATCH] fixes to limit

---
 app/controllers/posts_controller.rb               | 2 +-
 app/models/wiki_page.rb                           | 2 +-
 app/presenters/post_set_presenters/wiki_page.rb   | 3 ---
 lib/danbooru/paginator.rb                         | 1 +
 lib/danbooru/paginator/active_record_extension.rb | 3 +--
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 2013b6746..2071f434b 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -5,7 +5,7 @@ class PostsController < ApplicationController
   rescue_from PostSets::SearchError, :with => :search_error
   
   def index
-    @post_set = PostSets::Post.new(tag_query, params[:page])
+    @post_set = PostSets::Post.new(tag_query, params[:page], params[:limit])
     @posts = @post_set.posts
     respond_with(@posts) do |format|
       format.atom
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 4c43a57c9..e59f167ab 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -105,7 +105,7 @@ class WikiPage < ActiveRecord::Base
   end
   
   def post_set
-    @post_set ||= PostSets::WikiPage.new(title)
+    @post_set ||= PostSets::WikiPage.new(title, 1, 4)
   end
   
   def presenter
diff --git a/app/presenters/post_set_presenters/wiki_page.rb b/app/presenters/post_set_presenters/wiki_page.rb
index ef2d85fe3..3dc3ca0fd 100644
--- a/app/presenters/post_set_presenters/wiki_page.rb
+++ b/app/presenters/post_set_presenters/wiki_page.rb
@@ -1,10 +1,7 @@
 module PostSetPresenters
   class WikiPage < Post
     def posts
-      Thread.current["records_per_page"] = 4
       @post_set.posts
-    ensure
-      Thread.current["records_per_page"] = nil
     end
   end
 end
diff --git a/lib/danbooru/paginator.rb b/lib/danbooru/paginator.rb
index ca9cfdc53..6df2567c6 100644
--- a/lib/danbooru/paginator.rb
+++ b/lib/danbooru/paginator.rb
@@ -1,5 +1,6 @@
 require "danbooru/paginator/active_record_extension"
 require "danbooru/paginator/numbered_collection_extension"
 require "danbooru/paginator/sequential_collection_extension"
+require "danbooru/paginator/pagination_error"
 
 ActiveRecord::Base.__send__(:include, Danbooru::Paginator::ActiveRecordExtension)
diff --git a/lib/danbooru/paginator/active_record_extension.rb b/lib/danbooru/paginator/active_record_extension.rb
index 141c47507..843db7d01 100644
--- a/lib/danbooru/paginator/active_record_extension.rb
+++ b/lib/danbooru/paginator/active_record_extension.rb
@@ -65,8 +65,7 @@ module Danbooru
         end
         
         def records_per_page
-          # ugly hack but no easy way to pass this info down
-          (Thread.current["records_per_page"] || @paginator_options[:limit] || Danbooru.config.posts_per_page).to_i
+          (@paginator_options[:limit] || Danbooru.config.posts_per_page).to_i
         end
 
         # taken from kaminari (https://github.com/amatsuda/kaminari)