FIX: Restoring backup shouldn't change disable_emails from "yes" to "non-staff"

2019-04-16 11:48:07 +02:00 · 2019-04-16 11:48:07 +02:00 · 3aca070311
parent ac27bdce14
commit 3aca070311
1 changed files with 1 additions and 1 deletions
--- a/lib/backup_restore/restorer.rb
+++ b/lib/backup_restore/restorer.rb
@ -403,7 +403,7 @@ module BackupRestore
      log "Reloading site settings..."
      SiteSetting.refresh!

-      if @disable_emails
+      if @disable_emails && SiteSetting.disable_emails == 'no'
        log "Disabling outgoing emails for non-staff users..."
        user = User.find_by_email(@user_info[:email]) || Discourse.system_user
        SiteSetting.set_and_log(:disable_emails, 'non-staff', user)