diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-20 23:13:19 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-20 23:13:19 +0200 |
| commit | 207fa59675cb624dde0e01c1d57597f752cdf095 (patch) | |
| tree | 472d03af5bc3e2df1b759717f723ca914f2a77aa /activerecord/lib/active_record/associations/association_collection.rb | |
| parent | 31cadc730a40281950a265ff6982dd76cc326828 (diff) | |
| parent | 50d37a76064239a731f81a4ba68b80946c4dfae2 (diff) | |
| download | rails-207fa59675cb624dde0e01c1d57597f752cdf095.tar.gz rails-207fa59675cb624dde0e01c1d57597f752cdf095.tar.bz2 rails-207fa59675cb624dde0e01c1d57597f752cdf095.zip | |
Merge remote branch 'rails/master'
Conflicts:
actionpack/lib/abstract_controller/base.rb
Diffstat (limited to 'activerecord/lib/active_record/associations/association_collection.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/association_collection.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb index 5b5094bcab..f8d46bcb48 100644 --- a/activerecord/lib/active_record/associations/association_collection.rb +++ b/activerecord/lib/active_record/associations/association_collection.rb @@ -390,7 +390,11 @@ module ActiveRecord begin if !loaded? if @target.is_a?(Array) && @target.any? - @target = find_target + @target.find_all {|t| t.new_record? } + @target = find_target.map do |f| + i = @target.index(f) + t = @target.delete_at(i) if i + (t && t.changed?) ? t : f + end + @target else @target = find_target end |