From 5b28e5254267c581ce6934408aaf458616e44e3f Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Thu, 6 Jan 2011 19:54:23 +0000 Subject: Don't not remove double negatives --- .../lib/active_record/associations/has_one_association.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb index 158ae376e1..7503130e8c 100644 --- a/activerecord/lib/active_record/associations/has_one_association.rb +++ b/activerecord/lib/active_record/associations/has_one_association.rb @@ -14,11 +14,11 @@ module ActiveRecord new_record(:build_association, attributes) end - def replace(obj, dont_save = false) + def replace(obj, save = true) load_target unless @target.nil? || @target == obj - if @reflection.options[:dependent] && !dont_save + if @reflection.options[:dependent] && save case @reflection.options[:dependent] when :delete @target.delete if @target.persisted? @@ -45,7 +45,7 @@ module ActiveRecord set_inverse_instance(obj) loaded - unless !@owner.persisted? || obj.nil? || dont_save + unless !@owner.persisted? || obj.nil? || !save return (obj.save ? self : false) else return (obj.nil? ? nil : self) @@ -65,7 +65,7 @@ module ActiveRecord def new_record(method, attributes) record = scoped.scoping { @reflection.send(method, attributes) } - replace(record, true) + replace(record, false) record end end -- cgit v1.2.3