diff options
author | Rick Olson <technoweenie@gmail.com> | 2006-10-18 16:42:19 +0000 |
---|---|---|
committer | Rick Olson <technoweenie@gmail.com> | 2006-10-18 16:42:19 +0000 |
commit | dbd0bd5e5c9946ffb48bf8651f81ebc6dd9b52e5 (patch) | |
tree | 0b285eb84a3a651e3b1ba59b64010644bc7fcc45 /actionpack/lib/action_view/helpers/url_helper.rb | |
parent | 02358c83b76f9fc56b6cabaee24b244d17d08cff (diff) | |
download | rails-dbd0bd5e5c9946ffb48bf8651f81ebc6dd9b52e5.tar.gz rails-dbd0bd5e5c9946ffb48bf8651f81ebc6dd9b52e5.tar.bz2 rails-dbd0bd5e5c9946ffb48bf8651f81ebc6dd9b52e5.zip |
Add <%= escape_once html %> to escape html while leaving any currently escaped entities alone. Fix button_to double-escaping issue. [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5322 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/helpers/url_helper.rb')
-rw-r--r-- | actionpack/lib/action_view/helpers/url_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb index 42c28335d5..4f52a018a7 100644 --- a/actionpack/lib/action_view/helpers/url_helper.rb +++ b/actionpack/lib/action_view/helpers/url_helper.rb @@ -131,8 +131,8 @@ module ActionView name ||= url html_options.merge!("type" => "submit", "value" => name) - - "<form method=\"#{form_method}\" action=\"#{h url}\" class=\"button-to\"><div>" + + + "<form method=\"#{form_method}\" action=\"#{escape_once url}\" class=\"button-to\"><div>" + method_tag + tag("input", html_options) + "</div></form>" end |