From cbdc78d6066c3ef2bf1cb481f23eab012d36d913 Mon Sep 17 00:00:00 2001 From: Toks Date: Sun, 7 Sep 2014 00:03:23 -0400 Subject: [PATCH] #2245 make gallery obey user's per page setting --- app/controllers/pools_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/pools_controller.rb b/app/controllers/pools_controller.rb index 9e395bd08..335010875 100644 --- a/app/controllers/pools_controller.rb +++ b/app/controllers/pools_controller.rb @@ -23,7 +23,8 @@ class PoolsController < ApplicationController end def gallery - @pools = Pool.series.search(params[:search]).order("updated_at desc").paginate(params[:page], :limit => params[:limit], :search_count => params[:search]) + limit = params[:limit] || CurrentUser.user.per_page + @pools = Pool.series.search(params[:search]).order("updated_at desc").paginate(params[:page], :limit => limit, :search_count => params[:search]) @post_set = PostSets::PoolGallery.new(@pools) end