Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 10:50:21 +08:00
Code Packages Activity Actions 13

FIX: deleting staged user of rejected email shouldn't delete incoming email

Browse source
This commit is contained in:
Gerhard Schlager 2017-10-31 15:13:23 +01:00
parent 8c27f28dcb
commit 880d154381
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/email/receiver.rb
View file

@ -756,7 +756,13 @@ module Email
def delete_staged_users
@staged_users.each do |user|
UserDestroyer.new(Discourse.system_user).destroy(user, quiet: true) if user.posts.count == 0
if @incoming_email.user.id == user.id
@incoming_email.update_columns(user_id: nil)
end
if user.posts.count == 0
UserDestroyer.new(Discourse.system_user).destroy(user, quiet: true)
end
end
end
end