diff options
| author | Marius Balteanu <marius.balteanu@zitec.com> | 2024-01-03 01:20:47 +0000 |
|---|---|---|
| committer | Marius Balteanu <marius.balteanu@zitec.com> | 2024-01-03 01:20:47 +0000 |
| commit | 8b0a4fb197906c61788734037240a25817c8ec5d (patch) | |
| tree | 851566c05e390d6ef67101585b70dd5c17466d1c /app | |
| parent | dde4d143d18b6a8e5868caec6886c7ce8f95479b (diff) | |
| download | redmine-8b0a4fb197906c61788734037240a25817c8ec5d.tar.gz redmine-8b0a4fb197906c61788734037240a25817c8ec5d.zip | |
Merge r22584 from trunk to 5.1-stable (#39999).
git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@22585 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/messages_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index b41830b85..a4b4478a2 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -125,6 +125,11 @@ class MessagesController < ApplicationController @content = +"#{ll(Setting.default_language, :text_user_wrote_in, {:value => @message.author, :link => "message##{@message.id}"})}\n> " end @content << @message.content.to_s.strip.gsub(%r{<pre>(.*?)</pre>}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" + + respond_to do |format| + format.html { render_404 } + format.js + end end def preview |