diff options
| author | larrylv <larrylv1990@gmail.com> | 2013-03-04 17:38:22 +0800 |
|---|---|---|
| committer | larrylv <larrylv1990@gmail.com> | 2013-03-05 12:43:05 +0800 |
| commit | 939b896a06c0cff661076d0ca3fbe8c1d5552e83 (patch) | |
| tree | feec62302e70bfaf86c85e3537456487d94352a2 /activerecord/lib/active_record/associations/through_association.rb | |
| parent | 927e649bc9dc5740285e4b4e9899421c2bbfefbe (diff) | |
| download | rails-939b896a06c0cff661076d0ca3fbe8c1d5552e83.tar.gz rails-939b896a06c0cff661076d0ca3fbe8c1d5552e83.tar.bz2 rails-939b896a06c0cff661076d0ca3fbe8c1d5552e83.zip | |
Fix issue #7526. Reload the target if it's stale.
* This has been fixed at master via `365b8b6`, but not at 3-2-stable branch.
* @stale_state should be nil when a model isn't saved. via `0f3901e`.
* set @stale_state to nil when reset the target.
Diffstat (limited to 'activerecord/lib/active_record/associations/through_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/through_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/through_association.rb b/activerecord/lib/active_record/associations/through_association.rb index fd0e90aaf0..be890e5767 100644 --- a/activerecord/lib/active_record/associations/through_association.rb +++ b/activerecord/lib/active_record/associations/through_association.rb @@ -62,7 +62,7 @@ module ActiveRecord # properly support stale-checking for nested associations. def stale_state if through_reflection.macro == :belongs_to - owner[through_reflection.foreign_key].to_s + owner[through_reflection.foreign_key] && owner[through_reflection.foreign_key].to_s end end |