From 7efad2afef20b6d0cf88d6f50422146a54f71d43 Mon Sep 17 00:00:00 2001 From: Georg Ledermann Date: Wed, 14 Jul 2010 08:35:45 +0200 Subject: [PATCH] Fixed has_many delete/nullify for STI descendent [#5105 state:resolved] --- activerecord/lib/active_record/associations.rb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 65daa8f..f963cac 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1539,7 +1539,7 @@ module ActiveRecord record, reflection.name, reflection.klass, - reflection.dependent_conditions(record, self.class, extra_conditions)) + reflection.dependent_conditions(record, self.class.base_class, extra_conditions)) end when :nullify before_destroy do |record| @@ -1548,7 +1548,7 @@ module ActiveRecord reflection.name, reflection.klass, reflection.primary_key_name, - reflection.dependent_conditions(record, self.class, extra_conditions)) + reflection.dependent_conditions(record, self.class.base_class, extra_conditions)) end when :restrict method_name = "has_many_dependent_restrict_for_#{reflection.name}".to_sym -- 1.7.1.1