1 files changed, 6 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index 5b203dcc57..25c23c63b7 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -144,7 +144,11 @@ module ActiveRecord
             @owner.connection.execute(sql)
           end
         end
-
+        
+        #def aliased_join_table_name
+        #  @reflection.options[:join_table]
+        #end
+        
         def construct_sql
           interpolate_sql_options!(@reflection.options, :finder_sql)
 
@@ -152,7 +156,7 @@ module ActiveRecord
             @finder_sql = @reflection.options[:finder_sql]
           else
             @finder_sql = "#{@reflection.options[:join_table]}.#{@reflection.primary_key_name} = #{@owner.quoted_id} "
-            @finder_sql << " AND (#{interpolate_sql(@reflection.options[:conditions])})" if @reflection.options[:conditions]
+            @finder_sql << " AND (#{conditions})" if conditions
           end
 
           @join_sql = "JOIN #{@reflection.options[:join_table]} ON #{@reflection.klass.table_name}.#{@reflection.klass.primary_key} = #{@reflection.options[:join_table]}.#{@reflection.association_foreign_key}"