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: Never mark emails sent to mailing list mirror as auto-generated

Browse Source
This commit is contained in:
Gerhard Schlager
2018-01-03 15:29:06 +01:00
parent abde97c5c0
commit d7cd7e4dc7
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/email/receiver.rb
View File

@@ -105,10 +105,10 @@ module Email
raise NoBodyDetectedError if body.blank? && attachments.empty?
if is_auto_generated?
if is_auto_generated? && !sent_to_mailinglist_mirror?
@incoming_email.update_columns(is_auto_generated: true)
if SiteSetting.block_auto_generated_emails? && !sent_to_mailinglist_mirror?
if SiteSetting.block_auto_generated_emails?
raise AutoGeneratedEmailError
end
end