SmtpMessageChannel: Fixing that the "reply to" address should fall back to site settings if not provided in the current email

This commit is contained in:
Benedek Farkas
2024-03-11 14:28:13 +01:00
parent 44dcc86386
commit 8449eade95

View File

@@ -121,9 +121,9 @@ namespace Orchard.Email.Services {
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());