diff options
| author | Matthew Draper <matthew@trebex.net> | 2014-06-07 10:13:00 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2014-06-07 10:13:00 +0930 |
| commit | fadbc7c9eea63e9d8d6ef29b126db4bd3335785b (patch) | |
| tree | d36f7e824937568595dcb90edb930080575d02f5 /actionview | |
| parent | 2cdf73023cf75b5c5876146d37d970996c5fe191 (diff) | |
| download | rails-fadbc7c9eea63e9d8d6ef29b126db4bd3335785b.tar.gz rails-fadbc7c9eea63e9d8d6ef29b126db4bd3335785b.tar.bz2 rails-fadbc7c9eea63e9d8d6ef29b126db4bd3335785b.zip | |
Unwrap another html_escape
/cc @tenderlove
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/lib/action_view/helpers/output_safety_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |