@@ -1,5 +1,7 @@ *SVN* +* Fixed that single quote was not escaped in a UrlHelper#link_to javascript confirm #549 [Scott Barron] + * Removed the default border on link_image_to (it broke xhtml strict) -- can be specified with :border => 0 #517 [?/caleb] * Fixed that form helpers would treat string and symbol keys differently in html_options (and possibly create duplicate entries) #112 [bitsweat] actionpack/CHANGELOG @@ -138,7 +138,7 @@ module ActionView private def convert_confirm_option_to_javascript!(html_options) if confirm = html_options.delete("confirm") - html_options["onclick"] = "return confirm('#{confirm}');" + html_options["onclick"] = "return confirm('#{confirm.gsub(/'/, '\\\\\'')}');" end end end actionpack/lib/action_view/helpers/url_helper.rb @@ -27,6 +27,10 @@ class UrlHelperTest < Test::Unit::TestCase "<a href=\"http://www.world.com\" onclick=\"return confirm('Are you sure?');\">Hello</a>", link_to("Hello", "http://www.world.com", :confirm => "Are you sure?") ) + assert_equal( + "<a href=\"http://www.world.com\" onclick=\"return confirm('You can\\'t possibly be sure, can you?');\">Hello</a>", + link_to("Hello", "http://www.world.com", :confirm => "You can't possibly be sure, can you?") + ) end def test_link_image_to actionpack/test/template/url_helper_test.rb eb5ca2ea5ff55e2f6a49580afab5e0ddd0b2bf11 David Heinemeier Hansson david@loudthinking.com http://github.com/zdennis/rails/commit/25b656fefa75954cffff119a14cf7650f4f99a92 25b656fefa75954cffff119a14cf7650f4f99a92 2005-03-06T04:07:13-08:00 2005-03-06T04:07:13-08:00 Fixed that single quote was not escaped in a UrlHelper#link_to javascript confirm #549 [Scott Barron] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@837 5ecf4fe2-1ee6-0310-87b1-e25e094e27de f61ce9d31d432a7c25284509b8309c270ebe2775 David Heinemeier Hansson david@loudthinking.com