diff options
author | Jo Liss <joliss42@gmail.com> | 2012-08-30 01:03:51 +0200 |
---|---|---|
committer | Jo Liss <joliss42@gmail.com> | 2012-08-30 01:03:51 +0200 |
commit | ec950cf2baf68c5bd0d59b591a9f47ee86c308e4 (patch) | |
tree | e584be7c1e02ee3d2994c1ff4cc962f4f21ef57e /activerecord/lib/active_record | |
parent | d4b8052e04d2e01f36d008e6e9d05097b6fe6184 (diff) | |
download | rails-ec950cf2baf68c5bd0d59b591a9f47ee86c308e4.tar.gz rails-ec950cf2baf68c5bd0d59b591a9f47ee86c308e4.tar.bz2 rails-ec950cf2baf68c5bd0d59b591a9f47ee86c308e4.zip |
Fix grammar
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/associations/has_one_association.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb index dd7da59a86..06bead41de 100644 --- a/activerecord/lib/active_record/associations/has_one_association.rb +++ b/activerecord/lib/active_record/associations/has_one_association.rb @@ -30,11 +30,11 @@ module ActiveRecord if (target || record) && target != record reflection.klass.transaction do remove_target!(options[:dependent]) if target && !target.destroyed? - + if record set_owner_attributes(record) set_inverse_instance(record) - + if owner.persisted? && save && !record.save nullify_owner_attributes(record) set_owner_attributes(target) if target @@ -82,7 +82,7 @@ module ActiveRecord if target.persisted? && owner.persisted? && !target.save set_owner_attributes(target) raise RecordNotSaved, "Failed to remove the existing associated #{reflection.name}. " + - "The record failed to save when after its foreign key was set to nil." + "The record failed to save after its foreign key was set to nil." end end end |