Fixes delimiters regexp.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3229 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixes delimiters regexp.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3229 e93f8b46-1217-0410-a6f0-8f06a7374b81
0704ac94 · Jean-Philippe Lang · 569d13b7 · 0704ac94
Commit 0704ac94 authored Dec 23, 2009 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mail_handler.rb app/models/mail_handler.rb +1 -1

No files found.
--- 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