diff options
| author | Rajinder Yadav <devguy.ca@gmail.com> | 2010-10-15 22:19:39 -0400 |
|---|---|---|
| committer | Rajinder Yadav <devguy.ca@gmail.com> | 2010-10-15 22:19:39 -0400 |
| commit | 62eb00a62e3868c3500372def52968b919332b51 (patch) | |
| tree | 8497f517402c19eae1fea22943565cbf11496ef7 /activerecord/lib/active_record/serialization.rb | |
| parent | 018bf0f5756ef3887815ea46d6671dc1d3b526cf (diff) | |
| parent | cffae06a4f1b7aac86a7e99cfb244890f837f976 (diff) | |
| download | rails-62eb00a62e3868c3500372def52968b919332b51.tar.gz rails-62eb00a62e3868c3500372def52968b919332b51.tar.bz2 rails-62eb00a62e3868c3500372def52968b919332b51.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activerecord/lib/active_record/serialization.rb')
| -rw-r--r-- | activerecord/lib/active_record/serialization.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/serialization.rb b/activerecord/lib/active_record/serialization.rb index dc73075a59..2bde06f562 100644 --- a/activerecord/lib/active_record/serialization.rb +++ b/activerecord/lib/active_record/serialization.rb @@ -45,7 +45,7 @@ module ActiveRecord #:nodoc: send(association) end - unless records.nil? + if records association_options = include_has_options ? include_associations[association] : base_only_or_except opts = options.merge(association_options) yield(association, records, opts) |