mirror of
https://github.com/meineerde/redmine.git
synced 2025-10-17 17:01:01 +00:00
allow unicode whitespace after mail handler body delimiters (#17718)
Contributed by Holger Just and Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@16609 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
5b61d56943
commit
8c03f2a6db
2
app/models/mail_handler.rb
Normal file → Executable file
2
app/models/mail_handler.rb
Normal file → Executable file
@ -578,7 +578,7 @@ class MailHandler < ActionMailer::Base
|
||||
end
|
||||
|
||||
unless delimiters.empty?
|
||||
regex = Regexp.new("^[> ]*(#{ Regexp.union(delimiters) })\s*[\r\n].*", Regexp::MULTILINE)
|
||||
regex = Regexp.new("^[> ]*(#{ Regexp.union(delimiters) })[[:blank:]]*[\r\n].*", Regexp::MULTILINE)
|
||||
body = body.gsub(regex, '')
|
||||
end
|
||||
body.strip
|
||||
|
||||
@ -10,9 +10,9 @@ Date: Sun, 22 Jun 2008 12:28:07 +0200
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain;
|
||||
format=flowed;
|
||||
charset="iso-8859-1";
|
||||
charset="utf-8";
|
||||
reply-type=original
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Content-Transfer-Encoding: quoted-printable
|
||||
X-Priority: 3
|
||||
X-MSMail-Priority: Normal
|
||||
X-Mailer: Microsoft Outlook Express 6.00.2900.2869
|
||||
@ -47,7 +47,7 @@ BREAK
|
||||
|
||||
This paragraph is between delimiters.
|
||||
|
||||
---
|
||||
---=C2=A0
|
||||
|
||||
This paragraph is after the delimiter so it shouldn't appear.
|
||||
|
||||
|
||||
@ -963,7 +963,7 @@ class MailHandlerTest < ActiveSupport::TestCase
|
||||
assert_issue_created(issue)
|
||||
assert issue.description.include?('This paragraph is before delimiters')
|
||||
assert issue.description.include?('--- This line starts with a delimiter')
|
||||
assert !issue.description.match(/^---$/)
|
||||
assert !issue.description.match(/^---#{"\u00A0"}$/)
|
||||
assert !issue.description.include?('This paragraph is after the delimiter')
|
||||
end
|
||||
end
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user