From 0704ac9444ace98321098478491ead3a6a637896 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Wed, 23 Dec 2009 19:52:48 +0000 Subject: [PATCH] Fixes delimiters regexp. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3229 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/mail_handler.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb index 188057573..98536a8fc 100644 --- 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