From 966962cf80dcc13c99d10f1053f233187840e0c3 Mon Sep 17 00:00:00 2001 From: albert Date: Mon, 14 Jan 2013 16:09:19 -0500 Subject: [PATCH] changes to limit --- app/logical/post_sets/post.rb | 2 +- lib/danbooru/paginator/active_record_extension.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/logical/post_sets/post.rb b/app/logical/post_sets/post.rb index c96955310..b98448df1 100644 --- a/app/logical/post_sets/post.rb +++ b/app/logical/post_sets/post.rb @@ -5,7 +5,7 @@ module PostSets def initialize(tags, page = 1, per_page = nil) @tag_array = Tag.scan_query(tags) @page = page - @per_page = (per_page || ::Post.records_per_page).to_i + @per_page = (per_page || Danbooru.config.posts_per_page).to_i @per_page = 200 if @per_page > 200 end diff --git a/lib/danbooru/paginator/active_record_extension.rb b/lib/danbooru/paginator/active_record_extension.rb index 61e9f3b98..9cbc07d6e 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)