diff options
| author | Ryan Bigg <radarlistener@gmail.com> | 2008-10-06 11:57:12 +1030 |
|---|---|---|
| committer | Ryan Bigg <radarlistener@gmail.com> | 2008-10-06 11:57:12 +1030 |
| commit | a21d8f632fe8aa3bf4c1b83accc7a2dd230c28e7 (patch) | |
| tree | bb0b0e9423d4e259de6041e661bba119f7871faa /activerecord/lib/active_record/attribute_methods.rb | |
| parent | b340337aaff5b59fdf2110207fec3e1c43f1380a (diff) | |
| parent | 6090513cfb8acb5554a6653a6f2cb87648585d41 (diff) | |
| download | rails-a21d8f632fe8aa3bf4c1b83accc7a2dd230c28e7.tar.gz rails-a21d8f632fe8aa3bf4c1b83accc7a2dd230c28e7.tar.bz2 rails-a21d8f632fe8aa3bf4c1b83accc7a2dd230c28e7.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb index e5486738f0..1c753524de 100644 --- a/activerecord/lib/active_record/attribute_methods.rb +++ b/activerecord/lib/active_record/attribute_methods.rb @@ -342,7 +342,9 @@ module ActiveRecord method_name = method.to_s if super return true - elsif self.private_methods.include?(method_name) && !include_private_methods + elsif !include_private_methods && super(method, true) + # If we're here than we haven't found among non-private methods + # but found among all methods. Which means that given method is private. return false elsif !self.class.generated_methods? self.class.define_attribute_methods |