aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/url_helper.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-04-19 05:10:55 -0700
committerXavier Noria <fxn@hashref.com>2010-04-19 05:10:55 -0700
commit792910bb69078ff1d14a6384b50e51aba2aae2dd (patch)
tree705defb52d5ac6eb903e97334de718defc7ba4e3 /actionpack/lib/action_view/helpers/url_helper.rb
parente00c72c9718e518eb99058781f6ee71fa46b38fe (diff)
parentad4615e97896428ca140411081442f1b5e7d6089 (diff)
downloadrails-792910bb69078ff1d14a6384b50e51aba2aae2dd.tar.gz
rails-792910bb69078ff1d14a6384b50e51aba2aae2dd.tar.bz2
rails-792910bb69078ff1d14a6384b50e51aba2aae2dd.zip
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_view/helpers/url_helper.rb')
-rw-r--r--actionpack/lib/action_view/helpers/url_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 0b748d700b..4ffc5ea127 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -504,7 +504,7 @@ module ActionView
"document.write('#{content_tag("a", name || email_address_obfuscated.html_safe, html_options.merge({ "href" => "mailto:"+email_address+extras }))}');".each_byte do |c|
string << sprintf("%%%x", c)
end
- "<script type=\"#{Mime::JS}\">eval(decodeURIComponent('#{string}'))</script>"
+ "<script type=\"#{Mime::JS}\">eval(decodeURIComponent('#{string}'))</script>".html_safe
elsif encode == "hex"
email_address_encoded = ''
email_address_obfuscated.each_byte do |c|