diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index af797707b0..e40b8d4760 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that the overwritten respond_to? method didn't take two parameters like the original #391 + * Added HasManyAssociation#count that works like Base#count #413 [intinig] * Fixed handling of binary content in blobs and similar fields for Ruby/MySQL and SQLite #409 [xal] diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 355587aa80..7471e91516 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -905,8 +905,8 @@ module ActiveRecord #:nodoc: # A Person object with a name attribute can ask person.respond_to?("name"), person.respond_to?("name="), and # person.respond_to?("name?") which will all return true. - def respond_to?(method) - self.class.column_methods_hash[method.to_sym] || respond_to_without_attributes?(method) + def respond_to?(method, include_priv = false) + self.class.column_methods_hash[method.to_sym] || respond_to_without_attributes?(method, include_priv) end private |