SmtpMessageChannel: Fixing that the "reply to" address should fall ba…

…ck to site settings if not provided in the current email
OrchardCMS · Mar 11, 2024 · 8449ead · 8449ead
1 parent 44dcc86
commit 8449ead
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs b/src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs
@@ -121,9 +121,9 @@ public void Process(IDictionary<string, object> parameters) {
                 fromAddress.Name = string.IsNullOrWhiteSpace(emailMessage.FromName) ? _smtpSettings.FromName : emailMessage.FromName;
                 mailMessage.From.Add(fromAddress);
 
-                if (!String.IsNullOrWhiteSpace(emailMessage.ReplyTo)) {
-                    mailMessage.ReplyTo.AddRange(ParseRecipients(emailMessage.ReplyTo));
-                }
+                mailMessage.ReplyTo.AddRange(ParseRecipients(string.IsNullOrWhiteSpace(emailMessage.ReplyTo)
+                    ? _smtpSettings.ReplyTo
+                    : emailMessage.ReplyTo));
 
                 if (emailMessage.NotifyReadEmail) {
                     mailMessage.Headers.Add("Disposition-Notification-To", mailMessage.From.ToString());