##// END OF EJS Templates
jro_apps » redmine
RSS
Merged r12969 and r12973 (#16353)....
Jean-Philippe Lang -
r12751:665767db440f
parent child
Show More
Side by Side Unified
Context file:
r12751:665767db440f Loading diff...:
Show file before | Show file after | Hide comments
@@ -66,7 +66,7 class JournalsController < ApplicationController
66 text = @issue.description
66 text = @issue.description
67 end
67 end
68 # Replaces pre blocks with [...]
68 # Replaces pre blocks with [...]
69 text = text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]')
69 text = text.to_s.strip.gsub(%r{<pre>(.*?)</pre>}m, '[...]')
70 @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> "
70 @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> "
71 @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
71 @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
72 rescue ActiveRecord::RecordNotFound
72 rescue ActiveRecord::RecordNotFound
Show file before | Show file after | Hide comments
@@ -113,7 +113,7 class MessagesController < ApplicationController
113 @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
113 @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
114
114
115 @content = "#{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
115 @content = "#{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
116 @content << @message.content.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
116 @content << @message.content.to_s.strip.gsub(%r{<pre>(.*?)</pre>}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
117 end
117 end
118
118
119 def preview
119 def preview
General Comments 0
You need to be logged in to leave comments. Login now