aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-01-11 23:49:15 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2012-01-11 23:49:15 -0200
commit61c5b4a9f6b953dd3f027b1a24c5526771bf8968 (patch)
tree377b0406039011e31069071b53497a4248afa487 /actionpack/lib/action_view/helpers
parent16c4cb04d4c3757f29be50a9cfb49472ac90f9ce (diff)
downloadrails-61c5b4a9f6b953dd3f027b1a24c5526771bf8968.tar.gz
rails-61c5b4a9f6b953dd3f027b1a24c5526771bf8968.tar.bz2
rails-61c5b4a9f6b953dd3f027b1a24c5526771bf8968.zip
html_escape already handles nil
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-rw-r--r--actionpack/lib/action_view/helpers/output_safety_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/output_safety_helper.rb b/actionpack/lib/action_view/helpers/output_safety_helper.rb
index b36723ee1b..2e7e9dc50c 100644
--- a/actionpack/lib/action_view/helpers/output_safety_helper.rb
+++ b/actionpack/lib/action_view/helpers/output_safety_helper.rb
@@ -28,7 +28,7 @@ module ActionView #:nodoc:
# # => "<p>foo</p><br /><p>bar</p>"
#
def safe_join(array, sep=$,)
- sep = ERB::Util.html_escape(sep || "")
+ sep = ERB::Util.html_escape(sep)
array.map { |i| ERB::Util.html_escape(i) }.join(sep).html_safe
end