diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-01-16 19:42:34 +0000 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-16 13:43:53 -0800 |
| commit | 115eedbb410c52364e3353266316c218a29e5998 (patch) | |
| tree | e639e5955772f81fb292d2995b062807bf5536cf | |
| parent | ef79b917848f07b61e3243027f5e2ce4bc006d78 (diff) | |
| download | rails-115eedbb410c52364e3353266316c218a29e5998.tar.gz rails-115eedbb410c52364e3353266316c218a29e5998.tar.bz2 rails-115eedbb410c52364e3353266316c218a29e5998.zip | |
Use self.target= rather than @target= as the former automatically sets loaded
| -rw-r--r-- | activerecord/lib/active_record/associations/belongs_to_association.rb | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/associations/has_one_association.rb | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/associations/belongs_to_association.rb b/activerecord/lib/active_record/associations/belongs_to_association.rb index a818a780ed..11e16de738 100644 --- a/activerecord/lib/active_record/associations/belongs_to_association.rb +++ b/activerecord/lib/active_record/associations/belongs_to_association.rb @@ -10,11 +10,9 @@ module ActiveRecord replace_keys(record) set_inverse_instance(record) - @target = record @updated = true if record - loaded - record + self.target = record end def updated? diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb index c38843ea68..1b366b74b6 100644 --- a/activerecord/lib/active_record/associations/has_one_association.rb +++ b/activerecord/lib/active_record/associations/has_one_association.rb @@ -24,8 +24,7 @@ module ActiveRecord end end - @target = record - loaded + self.target = record end private |