diff options
| author | fatkodima <fatkodima123@gmail.com> | 2018-02-08 16:13:15 +0200 |
|---|---|---|
| committer | fatkodima <fatkodima123@gmail.com> | 2018-02-08 16:13:56 +0200 |
| commit | 42a3c92c8c43a16185800e357bd95104288d761c (patch) | |
| tree | a63a12bdf7b37291eb6153d1db3641f3382a2839 /activerecord/lib | |
| parent | d7f9adf7941574d0a40a165739938d28f278bd77 (diff) | |
| download | rails-42a3c92c8c43a16185800e357bd95104288d761c.tar.gz rails-42a3c92c8c43a16185800e357bd95104288d761c.tar.bz2 rails-42a3c92c8c43a16185800e357bd95104288d761c.zip | |
Fix marshaling of models with `has_many :through` associations
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/association.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/association.rb b/activerecord/lib/active_record/associations/association.rb index 7667c6ed8b..364f1fe74f 100644 --- a/activerecord/lib/active_record/associations/association.rb +++ b/activerecord/lib/active_record/associations/association.rb @@ -156,9 +156,9 @@ module ActiveRecord reset end - # We can't dump @reflection since it contains the scope proc + # We can't dump @reflection and @through_reflection since it contains the scope proc def marshal_dump - ivars = (instance_variables - [:@reflection]).map { |name| [name, instance_variable_get(name)] } + ivars = (instance_variables - [:@reflection, :@through_reflection]).map { |name| [name, instance_variable_get(name)] } [@reflection.name, ivars] end |