From 6887c563565949bf9e7b9cffd3d0487fde8ed07c Mon Sep 17 00:00:00 2001 From: Yuki Nishijima Date: Fri, 7 Sep 2012 14:14:06 +0900 Subject: [PATCH] Revert @eaca75e for amatsuda/kaminari#280 --- lib/kaminari/models/configuration_methods.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/kaminari/models/configuration_methods.rb b/lib/kaminari/models/configuration_methods.rb index 6e29be4..bfff9ac 100644 --- a/lib/kaminari/models/configuration_methods.rb +++ b/lib/kaminari/models/configuration_methods.rb @@ -27,7 +27,7 @@ module Kaminari # This model's max +per_page+ value # returns +max_per_page+ value unless explicitly overridden via max_paginates_per def max_per_page - @_max_per_page ||= Kaminari.config.max_per_page + @_max_per_page || Kaminari.config.max_per_page end end end