diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2016-07-26 11:43:47 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-26 11:43:47 -0300 |
| commit | c4b33a779680ee8f38d510789dfe1b3749a47734 (patch) | |
| tree | 1ac253a7c6c6c6170aff1f32eafe53d1901f38cb /activerecord/lib | |
| parent | c59715fa256b940f7bce912c5b4b2584fac05154 (diff) | |
| parent | beb6b7add71cc97d907958e4d7a1b5b8e9134cac (diff) | |
| download | rails-c4b33a779680ee8f38d510789dfe1b3749a47734.tar.gz rails-c4b33a779680ee8f38d510789dfe1b3749a47734.tar.bz2 rails-c4b33a779680ee8f38d510789dfe1b3749a47734.zip | |
Merge pull request #25929 from kamipo/load_target_is_public_method
`load_target` is a public method
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_one_through_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_one_through_association.rb b/activerecord/lib/active_record/associations/has_one_through_association.rb index 08e0ec691f..604904abcc 100644 --- a/activerecord/lib/active_record/associations/has_one_through_association.rb +++ b/activerecord/lib/active_record/associations/has_one_through_association.rb @@ -15,7 +15,7 @@ module ActiveRecord ensure_not_nested through_proxy = owner.association(through_reflection.name) - through_record = through_proxy.send(:load_target) + through_record = through_proxy.load_target if through_record && !record through_record.destroy |