github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-25 19:29:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: Include "via <site_name>" in email From header

Browse Source
This commit is contained in:
Gerhard Schlager
2019-01-04 16:06:21 +01:00
parent 788719d271
commit c0a8bb9a91
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/email/message_builder.rb
View File

@ -208,8 +208,8 @@ module Email
SiteSetting.email_site_title.blank? &&
SiteSetting.title.blank?
if !@opts[:from_alias].blank?
"\"#{Email.cleanup_alias(@opts[:from_alias])}\" <#{source}>"
if @opts[:from_alias].present?
%Q|"#{Email.cleanup_alias(@opts[:from_alias])}" <#{source}>|
elsif source == SiteSetting.notification_email || source == SiteSetting.reply_by_email_address
site_alias_email(source)
else
@ -218,8 +218,8 @@ module Email
end
def site_alias_email(source)
from_alias = SiteSetting.email_site_title.presence || SiteSetting.title
"\"#{Email.cleanup_alias(from_alias)}\" <#{source}>"
from_alias = Email.site_title
%Q|"#{Email.cleanup_alias(from_alias)}" <#{source}>|
end
end