diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2018-02-27 15:54:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-27 15:54:44 +0000 |
| commit | 70169dca8faf7c037906b7f88d2dff723eaf7187 (patch) | |
| tree | ca2849952dc37c429630529075aa8e63a90a4eda /actionview/lib/action_view/helpers/form_helper.rb | |
| parent | 6717d6027ce7f6383baf6c78115debdbcf2348ac (diff) | |
| parent | 96eeea538c9c5b7b60d6f8baed2e86a9e2a920c9 (diff) | |
| download | rails-70169dca8faf7c037906b7f88d2dff723eaf7187.tar.gz rails-70169dca8faf7c037906b7f88d2dff723eaf7187.tar.bz2 rails-70169dca8faf7c037906b7f88d2dff723eaf7187.zip | |
Merge pull request #32125 from rails/switch-to-not-enforcing-utf8-by-default
Don't enforce UTF-8 by default
Diffstat (limited to 'actionview/lib/action_view/helpers/form_helper.rb')
| -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 df974cc978..6fd66066c6 100644 --- a/actionview/lib/action_view/helpers/form_helper.rb +++ b/actionview/lib/action_view/helpers/form_helper.rb @@ -1519,10 +1519,10 @@ module ActionView private def html_options_for_form_with(url_for_options = nil, model = nil, html: {}, local: !form_with_generates_remote_forms, - skip_enforcing_utf8: false, **options) + skip_enforcing_utf8: nil, **options) html_options = options.slice(:id, :class, :multipart, :method, :data).merge(html) html_options[:method] ||= :patch if model.respond_to?(:persisted?) && model.persisted? - html_options[:enforce_utf8] = !skip_enforcing_utf8 + html_options[:enforce_utf8] = !skip_enforcing_utf8 unless skip_enforcing_utf8.nil? html_options[:enctype] = "multipart/form-data" if html_options.delete(:multipart) |