lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-27 04:19:04 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Benedek Farkas
2024-03-11 14:28:13 +01:00
parent 44dcc86386
commit 8449eade95
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs
View File

@@ -121,9 +121,9 @@ namespace Orchard.Email.Services {
fromAddress.Name = string.IsNullOrWhiteSpace(emailMessage.FromName) ? _smtpSettings.FromName : emailMessage.FromName; fromAddress.Name = string.IsNullOrWhiteSpace(emailMessage.FromName) ? _smtpSettings.FromName : emailMessage.FromName;
mailMessage.From.Add(fromAddress); mailMessage.From.Add(fromAddress);
if (!String.IsNullOrWhiteSpace(emailMessage.ReplyTo)) { mailMessage.ReplyTo.AddRange(ParseRecipients(string.IsNullOrWhiteSpace(emailMessage.ReplyTo)
mailMessage.ReplyTo.AddRange(ParseRecipients(emailMessage.ReplyTo)); ? _smtpSettings.ReplyTo
} : emailMessage.ReplyTo));
if (emailMessage.NotifyReadEmail) { if (emailMessage.NotifyReadEmail) {
mailMessage.Headers.Add("Disposition-Notification-To", mailMessage.From.ToString()); mailMessage.Headers.Add("Disposition-Notification-To", mailMessage.From.ToString());