diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-02-26 09:47:33 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-02-26 09:47:33 -0800 |
| commit | fcf8d6e40f516de30dd6805f5a988e4c20701878 (patch) | |
| tree | 3f88586fff65fffde8eaa2f8ba45eeac7312f5a7 /activerecord/lib/active_record/associations/builder/belongs_to.rb | |
| parent | e24e086ef1de73beffc0870cb37d6ae42cbbd2c8 (diff) | |
| parent | dce4383319d8fcccc26d12fc0bbd4b19a149ee41 (diff) | |
| download | rails-fcf8d6e40f516de30dd6805f5a988e4c20701878.tar.gz rails-fcf8d6e40f516de30dd6805f5a988e4c20701878.tar.bz2 rails-fcf8d6e40f516de30dd6805f5a988e4c20701878.zip | |
Merge pull request #9443 from exviva/belongs_to_touch_new_record
Fix touching an invalid parent record for belongs_to
Diffstat (limited to 'activerecord/lib/active_record/associations/builder/belongs_to.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/belongs_to.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/builder/belongs_to.rb b/activerecord/lib/active_record/associations/builder/belongs_to.rb index 2f2600b7fb..97b1ff18e2 100644 --- a/activerecord/lib/active_record/associations/builder/belongs_to.rb +++ b/activerecord/lib/active_record/associations/builder/belongs_to.rb @@ -48,7 +48,7 @@ module ActiveRecord::Associations::Builder def belongs_to_touch_after_save_or_destroy_for_#{name} record = #{name} - unless record.nil? + unless record.nil? || record.new_record? record.touch #{options[:touch].inspect if options[:touch] != true} end end |