diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-20 14:23:30 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-20 14:23:30 -0200 |
| commit | 725d5c85fcc7af5cf13a895f13c469f298c6112a (patch) | |
| tree | d9990eed4eb29542c01d743c7b70a80de9cbaaac | |
| parent | 1f5b58c079cc0ae3ee217eb3f1b4c5b2273a16e1 (diff) | |
| parent | 7c3d25f61c4ffbccd0061d0230776883a73966e9 (diff) | |
| download | rails-725d5c85fcc7af5cf13a895f13c469f298c6112a.tar.gz rails-725d5c85fcc7af5cf13a895f13c469f298c6112a.tar.bz2 rails-725d5c85fcc7af5cf13a895f13c469f298c6112a.zip | |
Merge pull request #17138 from jpcody/rename_default_form_builder
Rename default_form_builder to avoid collision
| -rw-r--r-- | actionview/lib/action_view/helpers/form_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/helpers/form_helper.rb b/actionview/lib/action_view/helpers/form_helper.rb index cd52763f31..43ddedb66c 100644 --- a/actionview/lib/action_view/helpers/form_helper.rb +++ b/actionview/lib/action_view/helpers/form_helper.rb @@ -1226,11 +1226,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 |