diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-08-17 18:16:32 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-08-17 18:22:29 +0100 |
| commit | 49cb4ed845e730f69fb2a26a594976039d3d2559 (patch) | |
| tree | 81b76808308186082e453d96f7f5a665f79da1e5 | |
| parent | 8cbad0293b134d56fb01e5f500010603b4c18cc7 (diff) | |
| download | rails-49cb4ed845e730f69fb2a26a594976039d3d2559.tar.gz rails-49cb4ed845e730f69fb2a26a594976039d3d2559.tar.bz2 rails-49cb4ed845e730f69fb2a26a594976039d3d2559.zip | |
align them assignments
| -rw-r--r-- | activerecord/lib/active_record/attribute_assignment.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/attribute_assignment.rb b/activerecord/lib/active_record/attribute_assignment.rb index e3feb91d30..6f6fc13d16 100644 --- a/activerecord/lib/active_record/attribute_assignment.rb +++ b/activerecord/lib/active_record/attribute_assignment.rb @@ -84,11 +84,11 @@ module ActiveRecord def assign_attributes(new_attributes, options = {}) return if new_attributes.blank? - attributes = new_attributes.stringify_keys - multi_parameter_attributes = [] + attributes = new_attributes.stringify_keys + multi_parameter_attributes = [] nested_parameter_attributes = [] - previous_options = @mass_assignment_options - @mass_assignment_options = options + previous_options = @mass_assignment_options + @mass_assignment_options = options unless options[:without_protection] attributes = sanitize_for_mass_assignment(attributes, mass_assignment_role) |