Merge pull request #15139 from zzak/habtm_build_model_name

Remove the assignment for real this time.
rails · May 16, 2014 · 654be5f · 654be5f
2 parents 0369dbf + 0372c50
commit 654be5f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb b/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
@@ -25,8 +25,8 @@ def self.build(lhs_class, name, options)
           class_name = options.fetch(:class_name) {
             model_name = name.to_s.camelize.singularize
 
-            if parent_name = lhs_class.parent_name
-              model_name.prepend("#{parent_name}::")
+            if lhs_class.parent_name
+              model_name.prepend("#{lhs_class.parent_name}::")
             end
 
             model_name