meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

allow unicode whitespace after mail handler body delimiters (#17718)

Browse Source 
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:
Toshi MARUYAMA 2017-06-06 01:34:52 +00:00
parent 5b61d56943
commit 8c03f2a6db
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/mail_handler.rb Normal file → Executable file
View File

@ -578,7 +578,7 @@ class MailHandler < ActionMailer::Base
end end
unless delimiters.empty? 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, '') body = body.gsub(regex, '')
end end
body.strip body.strip

6
test/fixtures/mail_handler/ticket_on_given_project.eml vendored
View File

@ -10,9 +10,9 @@ Date: Sun, 22 Jun 2008 12:28:07 +0200
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; Content-Type: text/plain;
format=flowed; format=flowed;
charset="iso-8859-1"; charset="utf-8";
reply-type=original reply-type=original
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: quoted-printable
X-Priority: 3 X-Priority: 3
X-MSMail-Priority: Normal X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 6.00.2900.2869 X-Mailer: Microsoft Outlook Express 6.00.2900.2869
@ -47,7 +47,7 @@ BREAK
This paragraph is between delimiters. This paragraph is between delimiters.
--- ---=C2=A0
This paragraph is after the delimiter so it shouldn't appear. This paragraph is after the delimiter so it shouldn't appear.

2
test/unit/mail_handler_test.rb
View File

@ -963,7 +963,7 @@ class MailHandlerTest < ActiveSupport::TestCase
assert_issue_created(issue) assert_issue_created(issue)
assert issue.description.include?('This paragraph is before delimiters') assert issue.description.include?('This paragraph is before delimiters')
assert issue.description.include?('--- This line starts with a delimiter') 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') assert !issue.description.include?('This paragraph is after the delimiter')
end end
end end