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