diff options
| author | wycats <wycats@gmail.com> | 2010-04-26 23:32:30 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-04-26 23:32:30 -0700 |
| commit | 91963e9e33eb5a28297323f1346aeb8b643e9d65 (patch) | |
| tree | 0452dbaf63110fb5a19c958da50d4677dee11333 /activerecord/lib/active_record/base.rb | |
| parent | d5d717161d853d8d7240da59b41a879bdac6e982 (diff) | |
| parent | c1d73270717f30498f8f4d55d6695509107c2834 (diff) | |
| download | rails-91963e9e33eb5a28297323f1346aeb8b643e9d65.tar.gz rails-91963e9e33eb5a28297323f1346aeb8b643e9d65.tar.bz2 rails-91963e9e33eb5a28297323f1346aeb8b643e9d65.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index fd24dcddc3..2d7cfad80d 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1844,8 +1844,7 @@ module ActiveRecord #:nodoc: # user.is_admin? # => true def attributes=(new_attributes, guard_protected_attributes = true) return if new_attributes.nil? - attributes = new_attributes.dup - attributes.stringify_keys! + attributes = new_attributes.stringify_keys multi_parameter_attributes = [] attributes = remove_attributes_protected_from_mass_assignment(attributes) if guard_protected_attributes |