diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-11-02 19:00:31 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-11-02 19:00:31 +0000 |
| commit | 0395eb99decaac54dc8acf6162b3129893341be0 (patch) | |
| tree | 134bc8837aab44633bfd8d5375c10c2c97912196 /app/models/mail_handler.rb | |
| parent | a04d64881cca1f741437cb57e44f3434bd8a7eb1 (diff) | |
| download | redmine-0395eb99decaac54dc8acf6162b3129893341be0.tar.gz redmine-0395eb99decaac54dc8acf6162b3129893341be0.zip | |
Remove email quotes (>) when searching for incoming email delimiters. #2852 #6628
Changes the email truncation so a delimiter can be prefixed by email
quotes or spaces ("> Eric said..."). This will let it be combined with
a "--- Reply above ---" delimiter to match "> --- Reply above ---"
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4361 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/mail_handler.rb')
| -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 518f0433f..35e339687 100644 --- a/app/models/mail_handler.rb +++ b/app/models/mail_handler.rb @@ -318,7 +318,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*[\r\n].*", Regexp::MULTILINE) + regex = Regexp.new("^[> ]*(#{ delimiters.join('|') })\s*[\r\n].*", Regexp::MULTILINE) body = body.gsub(regex, '') end body.strip |