X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6bf25141de8b1fa21198e3cfe85ff95f39231efe..6d1167356221c518eb8f1f94745bb33908de826a:/vendor/plugins/classic_pagination/lib/pagination.rb?ds=sidebyside

diff --git a/vendor/plugins/classic_pagination/lib/pagination.rb b/vendor/plugins/classic_pagination/lib/pagination.rb
index b6e9cf4bc..140a7d79b 100644
--- a/vendor/plugins/classic_pagination/lib/pagination.rb
+++ b/vendor/plugins/classic_pagination/lib/pagination.rb
@@ -97,8 +97,8 @@ module ActionController
             "Unknown options: #{unknown_option_keys.join(', ')}" unless
               unknown_option_keys.empty?
 
-      options[:singular_name] ||= Inflector.singularize(collection_id.to_s)
-      options[:class_name]  ||= Inflector.camelize(options[:singular_name])
+      options[:singular_name] ||= ActiveSupport::Inflector.singularize(collection_id.to_s)
+      options[:class_name]  ||= ActiveSupport::Inflector.camelize(options[:singular_name])
     end
 
     # Returns a paginator and a collection of Active Record model instances
@@ -175,7 +175,6 @@ module ActionController
     def count_collection_for_pagination(model, options)
       model.count(:conditions => options[:conditions],
                   :joins => options[:join] || options[:joins],
-                  :include => options[:include],
                   :select => (options[:group] ? "DISTINCT #{options[:group]}" : options[:count]))
     end