aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-10-01 15:42:28 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-10-01 15:42:28 -0700
commitc00173b32590455c7f79ae648e8992e14e810364 (patch)
treedbc34954ed0090dd859a603b2b9c76d8ae611a07 /activerecord/lib/active_record/associations.rb
parentad7b5efb55bcc2e0ccd3e7f22a81e984df8676d1 (diff)
downloadrails-c00173b32590455c7f79ae648e8992e14e810364.tar.gz
rails-c00173b32590455c7f79ae648e8992e14e810364.tar.bz2
rails-c00173b32590455c7f79ae648e8992e14e810364.zip
only pass options to the habtm builder
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
-rw-r--r--activerecord/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 d68fb33962..c621a49804 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1570,7 +1570,7 @@ module ActiveRecord
def has_and_belongs_to_many1(name, scope = nil, options = {}, &extension)
# temporarily
- habtm_builder = Builder::HasAndBelongsToMany.create_builder(self, name, scope, options, &extension)
+ habtm_builder = Builder::HasAndBelongsToMany.create_builder(self, name, nil, options)
habtm = habtm_builder.build self
join_class_name = "HABTM_#{name.to_s.camelize}"