From 60f2a06eee7830ee4556ceb2fc2c8669d1ee0b67 Mon Sep 17 00:00:00 2001 From: albert Date: Mon, 14 Jan 2013 16:13:02 -0500 Subject: [PATCH] bug fix --- lib/danbooru/paginator/active_record_extension.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/danbooru/paginator/active_record_extension.rb b/lib/danbooru/paginator/active_record_extension.rb index 9cbc07d6e..141c47507 100644 --- a/lib/danbooru/paginator/active_record_extension.rb +++ b/lib/danbooru/paginator/active_record_extension.rb @@ -7,7 +7,7 @@ module Danbooru module ClassMethods def paginate(page, options = {}) - @paginator_options = options || {} + @paginator_options = options if use_sequential_paginator?(page) paginate_sequential(page) @@ -66,7 +66,7 @@ module Danbooru def records_per_page # ugly hack but no easy way to pass this info down - (@paginator_options[:limit] || Thread.current["records_per_page"] || Danbooru.config.posts_per_page).to_i + (Thread.current["records_per_page"] || @paginator_options[:limit] || Danbooru.config.posts_per_page).to_i end # taken from kaminari (https://github.com/amatsuda/kaminari)