button_to should generate an html_safe string

Signed-off-by: Michael Koziarski <michael@koziarski.com>
rails · Mar 22, 2010 · 26f2cce · 26f2cce
1 parent c0137f6
commit 26f2cce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -308,8 +308,8 @@ def button_to(name, options = {}, html_options = {})
 
         html_options.merge!("type" => "submit", "value" => name)
 
-        "<form method=\"#{form_method}\" action=\"#{escape_once url}\" class=\"button-to\"><div>" +
-          method_tag + tag("input", html_options) + request_token_tag + "</div></form>".html_safe
+        ("<form method=\"#{form_method}\" action=\"#{escape_once url}\" class=\"button-to\"><div>" +
+          method_tag + tag("input", html_options) + request_token_tag + "</div></form>").html_safe
       end
 
 

diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
@@ -88,6 +88,10 @@ def test_button_to_with_method_get
     )
   end
 
+  def test_button_to_returns_an_html_safe_string
+    assert button_to("Hello", "http://www.example.com").html_safe?
+  end
+
   def test_link_tag_with_straight_url
     assert_dom_equal "<a href=\"http://www.example.com\">Hello</a>", link_to("Hello", "http://www.example.com")
   end