github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 07:53:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: backport a minimal String#scrub

Browse Source 
BUGFIX: invalid byte sequence in email would explode all processing
This commit is contained in:
Sam
2013-12-30 14:05:25 +11:00
parent 81eec5ff06
commit 9738c4ff48
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/email/receiver.rb
View File

@ -94,10 +94,10 @@ module Email
end
def discourse_email_parser
lines = @body.lines.to_a
lines = @body.scrub.lines.to_a
range_end = 0
email_year = lines.each_with_index do |l, idx|
lines.each_with_index do |l, idx|
break if l =~ /\A\s*\-{3,80}\s*\z/ ||
l =~ Regexp.new("\\A\\s*" + I18n.t('user_notifications.previous_discussion') + "\\s*\\Z") ||
(l =~ /via #{SiteSetting.title}(.*)\:$/) ||