Permalink
Browse files

Merge pull request #5183 from lest/patch-1

use content_tag in button_to helper
  • Loading branch information...
2 parents adb802e + f7714ec commit 1d59caa975a9919a418a08bbaabfa62f0d9dafcd @josevalim josevalim committed Mar 26, 2012
Showing with 3 additions and 2 deletions.
  1. +3 −2 actionpack/lib/action_view/helpers/url_helper.rb
@@ -334,7 +334,7 @@ def button_to(name, options = {}, html_options = {})
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 @@ def button_to(name, options = {}, html_options = {})
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

0 comments on commit 1d59caa

Please sign in to comment.