diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index fc4edae21..fe1c01907 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -66,7 +66,7 @@ class JournalsController < ApplicationController text = @issue.description end # Replaces pre blocks with [...] - text = text.to_s.strip.gsub(%r{
((.|\s)*?)}m, '[...]') + text = text.to_s.strip.gsub(%r{
(.*?)}m, '[...]') @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> " @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" rescue ActiveRecord::RecordNotFound diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 2bbce2d1d..0eb9f0bef 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -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{
((.|\s)*?)}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" + @content << @message.content.to_s.strip.gsub(%r{
(.*?)}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" end def preview