Merge branch 'master' of git://github.com/al/has_many_polymorphs

jerome · Dec 10, 2008 · 1661ef9 · 1661ef9
2 parents 46a2a76 + 5030a50
commit 1661ef9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/generators/tagging/templates/tagging_extensions.rb b/generators/tagging/templates/tagging_extensions.rb
@@ -120,7 +120,7 @@ def tagged_with(*tag_list)
       sql  = "SELECT #{(scope && scope[:select]) || options[:select]} "
       sql << "FROM #{(scope && scope[:from]) || options[:from]} "
 
-      add_joins!(sql, options, scope)
+      add_joins!(sql, options[:joins], scope)
 
       sql << "WHERE #{table_name}.#{primary_key} = taggings.taggable_id "
       sql << "AND taggings.taggable_type = '#{ActiveRecord::Base.send(:class_name_of_active_record_descendant, self).to_s}' "

diff --git a/lib/has_many_polymorphs/reflection.rb b/lib/has_many_polymorphs/reflection.rb
@@ -33,7 +33,7 @@ class PolymorphicError < ActiveRecordError #:nodoc:
 
 =end
 
-    class PolymorphicReflection < AssociationReflection
+    class PolymorphicReflection < ThroughReflection
       # Stub out the validity check. Has_many_polymorphs checks validity on macro creation, not on reflection.
       def check_validity! 
         # nothing