Fixes delimiters regexp.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3229 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
569d13b7f5
commit
0704ac9444
|
@ -309,7 +309,7 @@ class MailHandler < ActionMailer::Base
|
||||||
def cleanup_body(body)
|
def cleanup_body(body)
|
||||||
delimiters = Setting.mail_handler_body_delimiters.to_s.split(/[\r\n]+/).reject(&:blank?).map {|s| Regexp.escape(s)}
|
delimiters = Setting.mail_handler_body_delimiters.to_s.split(/[\r\n]+/).reject(&:blank?).map {|s| Regexp.escape(s)}
|
||||||
unless delimiters.empty?
|
unless delimiters.empty?
|
||||||
regex = Regexp.new("^(#{ delimiters.join('|') })\s*$.*", Regexp::MULTILINE)
|
regex = Regexp.new("^(#{ delimiters.join('|') })\s*[\r\n].*", Regexp::MULTILINE)
|
||||||
body = body.gsub(regex, '')
|
body = body.gsub(regex, '')
|
||||||
end
|
end
|
||||||
body.strip
|
body.strip
|
||||||
|
|
Loading…
Reference in New Issue