Changes the email truncation so a delimiter can be prefixed by email
quotes or spaces ("> Eric said..."). This will let it be combined with
a "--- Reply above ---" delimiter to match "> --- Reply above ---"
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4361 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -318,7 +318,7 @@ class MailHandler < ActionMailer::Base
|
||||
def cleanup_body(body)
|
||||
delimiters = Setting.mail_handler_body_delimiters.to_s.split(/[\r\n]+/).reject(&:blank?).map {|s| Regexp.escape(s)}
|
||||
unless delimiters.empty?
|
||||
regex = Regexp.new("^(#{ delimiters.join('|') })\s*[\r\n].*", Regexp::MULTILINE)
|
||||
regex = Regexp.new("^[> ]*(#{ delimiters.join('|') })\s*[\r\n].*", Regexp::MULTILINE)
|
||||
body = body.gsub(regex, '')
|
||||
end
|
||||
body.strip
|
||||
|
||||
Reference in New Issue
Block a user