diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-12-23 19:52:48 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-12-23 19:52:48 +0000 |
| commit | 0704ac9444ace98321098478491ead3a6a637896 (patch) | |
| tree | 22da1e605961cf5804a0c1c92959f0046a62d795 /app | |
| parent | 569d13b7f5f3426b5de7c3c346a4d4100df0a25c (diff) | |
| download | redmine-0704ac9444ace98321098478491ead3a6a637896.tar.gz redmine-0704ac9444ace98321098478491ead3a6a637896.zip | |
Fixes delimiters regexp.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3229 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/mail_handler.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |