Merge pull request #2939 from sbwalker/dev

filter deleted sites in notification job
oqtane · Jun 27, 2023 · ea4b85a · ea4b85a
2 parents cd8d2dd + 60b6a9c
commit ea4b85a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs b/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs
@@ -42,7 +42,7 @@ public override string ExecuteJob(IServiceProvider provider)
                 // get site settings
                 List<Setting> sitesettings = settingRepository.GetSettings(EntityNames.Site, site.SiteId).ToList();
                 Dictionary<string, string> settings = GetSettings(sitesettings);
-                if (!settings.ContainsKey("SMTPEnabled") || settings["SMTPEnabled"] == "True")
+                if (!site.IsDeleted && (!settings.ContainsKey("SMTPEnabled") || settings["SMTPEnabled"] == "True"))
                 {
                     if (settings.ContainsKey("SMTPHost") && settings["SMTPHost"] != "" &&
                         settings.ContainsKey("SMTPPort") && settings["SMTPPort"] != "" &&
@@ -162,7 +162,7 @@ public override string ExecuteJob(IServiceProvider provider)
                 }
                 else
                 {
-                    log += "SMTP Disabled In Site Settings" + "<br />";
+                    log += "Site Deleted Or SMTP Disabled In Site Settings" + "<br />";
                 }
             }