diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-12 10:45:19 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-12 10:45:19 -0700 |
| commit | a268d2dc972c73b9f406002364b633afa0d3d98c (patch) | |
| tree | 5bbce63602924c8b3d301905167d0130b0aeaf89 /activerecord/lib/active_record/attribute_assignment.rb | |
| parent | fa4b0295b62c1ff60d28f267435bfa7d90db5b95 (diff) | |
| parent | 79c8c4fed46775f30551f6d4b0c50b9ba397bc54 (diff) | |
| download | rails-a268d2dc972c73b9f406002364b633afa0d3d98c.tar.gz rails-a268d2dc972c73b9f406002364b633afa0d3d98c.tar.bz2 rails-a268d2dc972c73b9f406002364b633afa0d3d98c.zip | |
Merge pull request #6676 from aurelian/master
Don't assign the attributes if the list is empty
Diffstat (limited to 'activerecord/lib/active_record/attribute_assignment.rb')
| -rw-r--r-- | activerecord/lib/active_record/attribute_assignment.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/attribute_assignment.rb b/activerecord/lib/active_record/attribute_assignment.rb index e0bf80142a..abc2fa546a 100644 --- a/activerecord/lib/active_record/attribute_assignment.rb +++ b/activerecord/lib/active_record/attribute_assignment.rb @@ -64,7 +64,7 @@ module ActiveRecord # user.name # => "Josh" # user.is_admin? # => true def assign_attributes(new_attributes, options = {}) - return unless new_attributes + return if new_attributes.blank? attributes = new_attributes.stringify_keys multi_parameter_attributes = [] |