diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-11 09:02:22 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-11 09:02:22 -0700 |
| commit | 55cfbd4809e17bf8e5bb057021b4be7f08648138 (patch) | |
| tree | 6f0ac7821c1955e6c6e06ab3ce439ee8b29ec3cd /activerecord/lib | |
| parent | 8ec1f30cfdea6c80db1434a9f96c28bb119689d0 (diff) | |
| parent | bb498a574980eb281f9f5fd5236f584bf23a829d (diff) | |
| download | rails-55cfbd4809e17bf8e5bb057021b4be7f08648138.tar.gz rails-55cfbd4809e17bf8e5bb057021b4be7f08648138.tar.bz2 rails-55cfbd4809e17bf8e5bb057021b4be7f08648138.zip | |
Merge pull request #519 from knapo/master
`guard_protected_attributes` has invalid assignment to be always true in attributes=
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/base.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index b2e058d746..e1bf2ccc8a 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1652,11 +1652,10 @@ MSG return unless new_attributes.is_a?(Hash) - guard_protected_attributes ||= true - if guard_protected_attributes - assign_attributes(new_attributes) - else + if guard_protected_attributes == false assign_attributes(new_attributes, :without_protection => true) + else + assign_attributes(new_attributes) end end |