diff options
| author | Christopher Meiklejohn <christopher.meiklejohn@gmail.com> | 2011-06-07 23:07:07 -0400 |
|---|---|---|
| committer | Christopher Meiklejohn <christopher.meiklejohn@gmail.com> | 2011-06-07 23:07:07 -0400 |
| commit | ef8b12a29e27ea01547779cb3a45b60ff90816b4 (patch) | |
| tree | 3e354faac9034d94243233712e5a9bf7c6e749f8 | |
| parent | 1300c034775a5d52ad9141fdf5bbdbb9159df96a (diff) | |
| download | rails-ef8b12a29e27ea01547779cb3a45b60ff90816b4.tar.gz rails-ef8b12a29e27ea01547779cb3a45b60ff90816b4.tar.bz2 rails-ef8b12a29e27ea01547779cb3a45b60ff90816b4.zip | |
Don't operate on the safebuffer, operate on a string and convert.
| -rw-r--r-- | actionpack/lib/action_view/helpers/text_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index 75422a343d..8f97eb7d75 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -258,11 +258,12 @@ module ActionView text = ''.html_safe if text.nil? start_tag = tag('p', html_options, true) text = sanitize(text) unless options[:sanitize] == false + text = text.to_str text.gsub!(/\r\n?/, "\n") # \r\n and \r -> \n text.gsub!(/\n\n+/, "</p>\n\n#{start_tag}") # 2+ newline -> paragraph text.gsub!(/([^\n]\n)(?=[^\n])/, '\1<br />') # 1 newline -> br text.insert 0, start_tag - text.html_safe.safe_concat("</p>") + text = ActiveSupport::SafeBuffer.new(text).safe_concat("</p>") end # Creates a Cycle object whose _to_s_ method cycles through elements of an |