summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-06-06 01:34:52 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-06-06 01:34:52 +0000
commit8c03f2a6db22600ea650a516a047a3902917dc01 (patch)
treeb0e53c2ca9006aa1cf5d6b79a35c7ef566ded280 /app
parent5b61d569437221f7aaa3d02df298039e8a32ff4a (diff)
downloadredmine-8c03f2a6db22600ea650a516a047a3902917dc01.tar.gz
redmine-8c03f2a6db22600ea650a516a047a3902917dc01.zip
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
Diffstat (limited to 'app')
-rwxr-xr-x[-rw-r--r--]app/models/mail_handler.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index 86ad4eb27..579731943 100644..100755
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -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