Merge pull request #5848 from W6HBR/dev

Fix SMTPRelay condition for sender email validation
This commit is contained in:
Shaun Walker
2025-12-02 11:27:44 -05:00
committed by GitHub

View File

@@ -186,7 +186,7 @@ namespace Oqtane.Infrastructure
var mailboxAddressValidationError = ""; var mailboxAddressValidationError = "";
// sender // sender
if (settingRepository.GetSettingValue(settings, "SMTPRelay", "False") != "True") if ((settingRepository.GetSettingValue(settings, "SMTPRelay", "False") == "True") && string.IsNullOrEmpty(fromEmail))
{ {
fromEmail = settingRepository.GetSettingValue(settings, "SMTPSender", ""); fromEmail = settingRepository.GetSettingValue(settings, "SMTPSender", "");
fromName = string.IsNullOrEmpty(fromName) ? site.Name : fromName; fromName = string.IsNullOrEmpty(fromName) ? site.Name : fromName;