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
This commit is contained in:
parent
8c769c546f
commit
326ed79b43
|
@ -94,10 +94,11 @@ class MessagesController < ApplicationController
|
||||||
user = @message.author
|
user = @message.author
|
||||||
text = @message.content
|
text = @message.content
|
||||||
subject = @message.subject.gsub('"', '\"')
|
subject = @message.subject.gsub('"', '\"')
|
||||||
|
subject = "RE: #{subject}" unless subject.starts_with?('RE:')
|
||||||
content = "#{ll(Setting.default_language, :text_user_wrote, user)}\\n> "
|
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"
|
content << text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub('"', '\"').gsub(/(\r?\n|\r\n?)/, "\\n> ") + "\\n\\n"
|
||||||
render(:update) { |page|
|
render(:update) { |page|
|
||||||
page << "$('reply_subject').value = \"RE: #{subject}\";"
|
page << "$('reply_subject').value = \"#{subject}\";"
|
||||||
page.<< "$('message_content').value = \"#{content}\";"
|
page.<< "$('message_content').value = \"#{content}\";"
|
||||||
page.show 'reply'
|
page.show 'reply'
|
||||||
page << "Form.Element.focus('message_content');"
|
page << "Form.Element.focus('message_content');"
|
||||||
|
|
Loading…
Reference in New Issue