diff options
| author | Sergey Nartimov <just.lest@gmail.com> | 2012-02-26 19:39:33 +0300 |
|---|---|---|
| committer | Sergey Nartimov <just.lest@gmail.com> | 2012-03-14 20:01:02 +0300 |
| commit | f7714eca47c5c57acb08ccbfb35ff224ac4d62b3 (patch) | |
| tree | 1c5494dd4d1fadadc20e05f5baa2d4588f40cb10 /actionpack/lib/action_view/helpers | |
| parent | ec22a2b81356511b7613fcd41b693035a3cf5040 (diff) | |
| download | rails-f7714eca47c5c57acb08ccbfb35ff224ac4d62b3.tar.gz rails-f7714eca47c5c57acb08ccbfb35ff224ac4d62b3.tar.bz2 rails-f7714eca47c5c57acb08ccbfb35ff224ac4d62b3.zip | |
use content_tag in button_to helper
Diffstat (limited to 'actionpack/lib/action_view/helpers')
| -rw-r--r-- | actionpack/lib/action_view/helpers/url_helper.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb index 29f556502b..4a641fada3 100644 --- a/actionpack/lib/action_view/helpers/url_helper.rb +++ b/actionpack/lib/action_view/helpers/url_helper.rb @@ -334,7 +334,7 @@ module ActionView remote = html_options.delete('remote') method = html_options.delete('method').to_s - method_tag = %w{patch put delete}.include?(method) ? method_tag(method) : "" + method_tag = %w{patch put delete}.include?(method) ? method_tag(method) : ''.html_safe form_method = method == 'get' ? 'get' : 'post' form_options = html_options.delete('form') || {} @@ -347,7 +347,8 @@ module ActionView html_options = convert_options_to_data_attributes(options, html_options) html_options.merge!("type" => "submit", "value" => name || url) - "#{tag(:form, form_options, true)}<div>#{method_tag}#{tag("input", html_options)}#{request_token_tag}</div></form>".html_safe + inner_tags = method_tag.safe_concat tag('input', html_options).safe_concat request_token_tag + content_tag('form', content_tag('div', inner_tags), form_options) end |