Merge pull request #17138 from jpcody/rename_default_form_builder

Rename default_form_builder to avoid collision
This commit is contained in:
Rafael Mendonça França 2015-02-20 14:23:30 -02:00
parent 7e230e2610
commit a73b31a673
1 changed files with 2 additions and 2 deletions

View File

@ -1142,11 +1142,11 @@ module ActionView
object_name = model_name_from_record_or_class(object).param_key
end
builder = options[:builder] || default_form_builder
builder = options[:builder] || default_form_builder_class
builder.new(object_name, object, self, options)
end
def default_form_builder
def default_form_builder_class
builder = ActionView::Base.default_form_builder
builder.respond_to?(:constantize) ? builder.constantize : builder
end