From fadbc7c9eea63e9d8d6ef29b126db4bd3335785b Mon Sep 17 00:00:00 2001
From: Matthew Draper <matthew@trebex.net>
Date: Sat, 7 Jun 2014 10:13:00 +0930
Subject: Unwrap another html_escape

/cc @tenderlove
---
 actionview/lib/action_view/helpers/output_safety_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionview/lib/action_view/helpers')

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
-- 
cgit v1.2.3