git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13026 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/2.5.1
@@ -66,7 +66,7 @@ class JournalsController < ApplicationController | |||
text = @issue.description | |||
end | |||
# Replaces pre blocks with [...] | |||
text = text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]') | |||
text = text.to_s.strip.gsub(%r{<pre>(.*?)</pre>}m, '[...]') | |||
@content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> " | |||
@content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" | |||
rescue ActiveRecord::RecordNotFound |
@@ -113,7 +113,7 @@ class MessagesController < ApplicationController | |||
@subject = "RE: #{@subject}" unless @subject.starts_with?('RE:') | |||
@content = "#{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> " | |||
@content << @message.content.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" | |||
@content << @message.content.to_s.strip.gsub(%r{<pre>(.*?)</pre>}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" | |||
end | |||
def preview |