diff options
| author | David Trasbo <me@dtrasbo.com> | 2010-06-30 21:33:49 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-07-08 23:24:20 +0200 |
| commit | 786342e17f42799ef889cf6127fe97e9598272e0 (patch) | |
| tree | 0e0d539db6000d2d7510cf9691bbe42681661684 /activerecord/lib | |
| parent | 1e53404fe9c39ad0849894d73e431315be8c0bf0 (diff) | |
| download | rails-786342e17f42799ef889cf6127fe97e9598272e0.tar.gz rails-786342e17f42799ef889cf6127fe97e9598272e0.tar.bz2 rails-786342e17f42799ef889cf6127fe97e9598272e0.zip | |
Return from ActiveRecord::Base#attributes= unless value is a hash [#4070 state:committed]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index cb74a01388..c78060c956 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1471,7 +1471,7 @@ MSG # user.send(:attributes=, { :username => 'Phusion', :is_admin => true }, false) # user.is_admin? # => true def attributes=(new_attributes, guard_protected_attributes = true) - return if new_attributes.nil? + return unless new_attributes.is_a? Hash attributes = new_attributes.stringify_keys multi_parameter_attributes = [] |