Merge api06 branch to trunk.

[rails.git] / vendor / plugins / classic_pagination / lib / pagination.rb

diff --git a/vendor/plugins/classic_pagination/lib/pagination.rb b/vendor/plugins/classic_pagination/lib/pagination.rb
index 6a3e1a97b0f661cb63937fc8bbcc6b0b6c533a38..b6e9cf4bc5378d03a7bbf81fd6f8d264acefb681 100644 (file)
--- 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] ||= ActiveSupport::Inflector.singularize(collection_id.to_s)
-      options[:class_name]  ||= ActiveSupport::Inflector.camelize(options[:singular_name])
+      options[:singular_name] ||= Inflector.singularize(collection_id.to_s)
+      options[:class_name]  ||= Inflector.camelize(options[:singular_name])
     end
 
     # Returns a paginator and a collection of Active Record model instances