Fixes delimiters regexp.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3229 e93f8b46-1217-0410-a6f0-8f06a7374b81
15 years ago · 0704ac9444
parent 569d13b7f5
commit 0704ac9444
1 changed files with 1 additions and 1 deletions
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@ -309,7 +309,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*$.*", Regexp::MULTILINE)
+      regex = Regexp.new("^(#{ delimiters.join('|') })\s*[\r\n].*", Regexp::MULTILINE)
      body = body.gsub(regex, '')
    end
    body.strip