summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2009-11-13 19:14:18 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2009-11-13 19:14:18 +0000
commit326ed79b432a3c0172cfbe0eaf801645e7b2e2c6 (patch)
tree15b45ec883bf4ff871b8f4a8bf7e9c169dcb75c7 /app
parent8c769c546f3337c56b0bba5e80500c26c03a843f (diff)
downloadredmine-326ed79b432a3c0172cfbe0eaf801645e7b2e2c6.tar.gz
redmine-326ed79b432a3c0172cfbe0eaf801645e7b2e2c6.zip
Fixed that "RE:" prefix is added to the subject each time the message is quoted (#4215).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3038 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/controllers/messages_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 7dd0fbec9..437d1a291 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -94,10 +94,11 @@ class MessagesController < ApplicationController
user = @message.author
text = @message.content
subject = @message.subject.gsub('"', '\"')
+ subject = "RE: #{subject}" unless subject.starts_with?('RE:')
content = "#{ll(Setting.default_language, :text_user_wrote, user)}\\n> "
content << text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub('"', '\"').gsub(/(\r?\n|\r\n?)/, "\\n> ") + "\\n\\n"
render(:update) { |page|
- page << "$('reply_subject').value = \"RE: #{subject}\";"
+ page << "$('reply_subject').value = \"#{subject}\";"
page.<< "$('message_content').value = \"#{content}\";"
page.show 'reply'
page << "Form.Element.focus('message_content');"