fixes #959

2013-03-22 10:38:37 -07:00
parent 40ee7e72b8
commit 3e4d149d28
8 changed files with 34 additions and 5 deletions
--- a/lib/danbooru/paginator/active_record_extension.rb
+++ b/lib/danbooru/paginator/active_record_extension.rb
@@ -81,7 +81,7 @@ module Danbooru
        def option_for(key)
          case key
          when :limit
-            limit = @paginator_options.try(:[], :limit) || Danbooru.config.posts_per_page
+            limit = @paginator_options.try(:[], :limit) || CurrentUser.user.per_page
            if limit.to_i > 1_000
              limit = 1_000
            end