From eedbe1c827beb17f60c479bdf08b25e4f8d2c0e4 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino
Date: Thu, 16 Jun 2011 12:46:11 -0300
Subject: Use html_safe
---
actionpack/lib/action_view/helpers/text_helper.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'actionpack/lib/action_view/helpers/text_helper.rb')
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index 8f97eb7d75..df450cc836 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -255,7 +255,7 @@ module ActionView
# simple_format("I'm allowed! It's true.", {}, :sanitize => false)
# # => "I'm allowed! It's true.
"
def simple_format(text, html_options={}, options={})
- text = ''.html_safe if text.nil?
+ text = '' if text.nil?
start_tag = tag('p', html_options, true)
text = sanitize(text) unless options[:sanitize] == false
text = text.to_str
@@ -263,7 +263,7 @@ module ActionView
text.gsub!(/\n\n+/, "
\n\n#{start_tag}") # 2+ newline -> paragraph
text.gsub!(/([^\n]\n)(?=[^\n])/, '\1
') # 1 newline -> br
text.insert 0, start_tag
- text = ActiveSupport::SafeBuffer.new(text).safe_concat("")
+ text.html_safe.safe_concat("")
end
# Creates a Cycle object whose _to_s_ method cycles through elements of an
--
cgit v1.2.3