IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: don't strip eml attachments from received emails

Browse Source
This commit is contained in:
Maja Komel
2018-11-01 08:41:13 +01:00
parent 48501b0d45
commit 1ac3e5473a
3 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/email/receiver.rb
View File

@@ -882,7 +882,7 @@ module Email
def attachments
# strip blacklisted attachments (mostly signatures)
@attachments ||= begin
attachments = @mail.attachments.select { |attachment| is_whitelisted_attachment?(attachment) }
attachments = @mail.parts.select { |part| part.attachment? && is_whitelisted_attachment?(part) }
attachments << @mail if @mail.attachment? && is_whitelisted_attachment?(@mail)
attachments
end