diff options
| author | Joshua Cody <josh@joshuacody.net> | 2014-10-01 22:26:12 -0500 |
|---|---|---|
| committer | Joshua Cody <josh@joshuacody.net> | 2014-10-01 22:26:12 -0500 |
| commit | 7c3d25f61c4ffbccd0061d0230776883a73966e9 (patch) | |
| tree | 6b15e9bc64ed012063265fd3885d405ce1236f53 /actionview | |
| parent | 6aa448255cd5c640dae45963c114418b76f454e0 (diff) | |
| download | rails-7c3d25f61c4ffbccd0061d0230776883a73966e9.tar.gz rails-7c3d25f61c4ffbccd0061d0230776883a73966e9.tar.bz2 rails-7c3d25f61c4ffbccd0061d0230776883a73966e9.zip | |
Rename default_form_builder to avoid collision
Diffstat (limited to 'actionview')
| -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 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 |