diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-03-17 08:19:11 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-03-17 08:19:11 -0700 |
| commit | e4807f0812d4b49a1a2b5c8e3c0bb5a2062c1151 (patch) | |
| tree | 11d6334a401cbb05d5e95471563d4ae64b6b13f6 /actionpack/lib | |
| parent | be1a7ebbbccd9b0a89614bca55ea79c26798b1e9 (diff) | |
| parent | 3ab7ddb8daa1d1754a9de06ee3cbc790f2025144 (diff) | |
| download | rails-e4807f0812d4b49a1a2b5c8e3c0bb5a2062c1151.tar.gz rails-e4807f0812d4b49a1a2b5c8e3c0bb5a2062c1151.tar.bz2 rails-e4807f0812d4b49a1a2b5c8e3c0bb5a2062c1151.zip | |
Merge pull request #9745 from madmax/allow_pass_multipart_to_form_for
Fix regression: allow pass multipart option to form_for
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index 3dae1fc87a..6b6a7edc1d 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -433,7 +433,7 @@ module ActionView builder = instantiate_builder(object_name, object, options) output = capture(builder, &block) - html_options[:multipart] = builder.multipart? + html_options[:multipart] ||= builder.multipart? form_tag(options[:url] || {}, html_options) { output } end |