aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRich Bradley <richbradley@gmail.com>2009-08-08 23:29:38 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-08-09 00:31:46 -0700
commit9bb8ef9edebf5c27b8a1c67ca3776d52afbc1dc4 (patch)
treefa7154082c74f53d2441407786ce72ecb68903da /activerecord/lib
parent0d539947017e0ba04601889e2a3e01a64bcadf69 (diff)
downloadrails-9bb8ef9edebf5c27b8a1c67ca3776d52afbc1dc4.tar.gz
rails-9bb8ef9edebf5c27b8a1c67ca3776d52afbc1dc4.tar.bz2
rails-9bb8ef9edebf5c27b8a1c67ca3776d52afbc1dc4.zip
Fix for nested :include with namespaced models.
[#260 state:committed]
Diffstat (limited to 'activerecord/lib')
-rwxr-xr-xactiverecord/lib/active_record/associations.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 66aa9332c8..cce7777039 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1912,7 +1912,7 @@ module ActiveRecord
descendant
end.flatten.compact
- remove_duplicate_results!(reflection.class_name.constantize, parent_records, associations[name]) unless parent_records.empty?
+ remove_duplicate_results!(reflection.klass, parent_records, associations[name]) unless parent_records.empty?
end
end
end