diff options
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/lib/action_view/base.rb | 2 | ||||
| -rw-r--r-- | actionview/lib/action_view/helpers/output_safety_helper.rb | 4 | ||||
| -rw-r--r-- | actionview/lib/action_view/helpers/url_helper.rb | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/actionview/lib/action_view/base.rb b/actionview/lib/action_view/base.rb index 455ce531ae..8235b30599 100644 --- a/actionview/lib/action_view/base.rb +++ b/actionview/lib/action_view/base.rb @@ -130,8 +130,6 @@ module ActionView #:nodoc: # end # end # end - # - # More builder documentation can be found at http://builder.rubyforge.org. class Base include Helpers, ::ERB::Util, Context diff --git a/actionview/lib/action_view/helpers/output_safety_helper.rb b/actionview/lib/action_view/helpers/output_safety_helper.rb index 60a4478c26..e1f40011c0 100644 --- a/actionview/lib/action_view/helpers/output_safety_helper.rb +++ b/actionview/lib/action_view/helpers/output_safety_helper.rb @@ -29,9 +29,9 @@ module ActionView #:nodoc: # # => "<p>foo</p><br /><p>bar</p>" # def safe_join(array, sep=$,) - sep = ERB::Util.html_escape(sep) + sep = ERB::Util.unwrapped_html_escape(sep) - array.map { |i| ERB::Util.html_escape(i) }.join(sep).html_safe + array.map { |i| ERB::Util.unwrapped_html_escape(i) }.join(sep).html_safe end end end diff --git a/actionview/lib/action_view/helpers/url_helper.rb b/actionview/lib/action_view/helpers/url_helper.rb index 894616a449..9a9777317a 100644 --- a/actionview/lib/action_view/helpers/url_helper.rb +++ b/actionview/lib/action_view/helpers/url_helper.rb @@ -462,7 +462,7 @@ module ActionView # <strong>Email me:</strong> <span>me@domain.com</span> # </a> def mail_to(email_address, name = nil, html_options = {}, &block) - email_address = ERB::Util.html_escape(email_address) + email_address = ERB::Util.unwrapped_html_escape(email_address) html_options, name = name, nil if block_given? html_options = (html_options || {}).stringify_keys @@ -471,7 +471,7 @@ module ActionView option = html_options.delete(item) || next "#{item}=#{Rack::Utils.escape_path(option)}" }.compact - extras = extras.empty? ? '' : '?' + ERB::Util.html_escape(extras.join('&')) + extras = extras.empty? ? '' : '?' + ERB::Util.unwrapped_html_escape(extras.join('&')) html_options["href"] = "mailto:#{email_address}#{extras}".html_safe |