From 7c3d25f61c4ffbccd0061d0230776883a73966e9 Mon Sep 17 00:00:00 2001 From: Joshua Cody Date: Wed, 1 Oct 2014 22:26:12 -0500 Subject: Rename default_form_builder to avoid collision --- actionview/lib/action_view/helpers/form_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionview/lib/action_view') diff --git a/actionview/lib/action_view/helpers/form_helper.rb b/actionview/lib/action_view/helpers/form_helper.rb index 038f9e384b..ff21f1d95b 100644 --- a/actionview/lib/action_view/helpers/form_helper.rb +++ b/actionview/lib/action_view/helpers/form_helper.rb @@ -1188,11 +1188,11 @@ module ActionView object_name = model_name_from_record_or_class(object).param_key end - builder = options[:builder] || default_form_builder + builder = options[:builder] || build_default_form_builder builder.new(object_name, object, self, options) end - def default_form_builder + def build_default_form_builder builder = ActionView::Base.default_form_builder builder.respond_to?(:constantize) ? builder.constantize : builder end -- cgit v1.2.3