diff options
| author | José Valim <jose.valim@gmail.com> | 2011-10-11 09:50:53 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-10-11 09:50:53 -0700 |
| commit | fa79408a559d250c59ab4dac34dc7e68e6b7533f (patch) | |
| tree | 283efa0d08d130d85f8381355ef69d692c6b3c83 /activemodel/lib | |
| parent | 7b84e36cd6212fbbcddee1620f0ffd0e1f5a0024 (diff) | |
| parent | 1adf5662b54adf2f1d63a3934629c0f3aadeacb9 (diff) | |
| download | rails-fa79408a559d250c59ab4dac34dc7e68e6b7533f.tar.gz rails-fa79408a559d250c59ab4dac34dc7e68e6b7533f.tar.bz2 rails-fa79408a559d250c59ab4dac34dc7e68e6b7533f.zip | |
Merge pull request #3295 from zhengjia/master
Fix multiple includes with options
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model/serialization.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/serialization.rb b/activemodel/lib/active_model/serialization.rb index 7bc3f997b5..a4b58ab456 100644 --- a/activemodel/lib/active_model/serialization.rb +++ b/activemodel/lib/active_model/serialization.rb @@ -126,7 +126,7 @@ module ActiveModel return unless include = options[:include] unless include.is_a?(Hash) - include = Hash[Array.wrap(include).map { |n| [n, {}] }] + include = Hash[Array.wrap(include).map { |n| n.is_a?(Hash) ? n.to_a.first : [n, {}] }] end include.each do |association, opts| |