github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 20:41:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: from field of emails should be including email_site_title or site title settings

Browse Source
This commit is contained in:
Neil Lalonde
2017-02-27 14:22:56 -05:00
parent f7d413bb1b
commit e634b37f9a
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/email/message_builder.rb
View File

@ -202,11 +202,16 @@ module Email
end
def alias_email(source)
return source if @opts[:from_alias].blank? && SiteSetting.email_site_title.blank?
return source if @opts[:from_alias].blank? &&
SiteSetting.email_site_title.blank? &&
SiteSetting.title.blank?
if !@opts[:from_alias].blank?
"#{Email.cleanup_alias(@opts[:from_alias])} <#{source}>"
elsif source == SiteSetting.notification_email || source == SiteSetting.reply_by_email_address
site_alias_email(source)
else
"#{Email.cleanup_alias(SiteSetting.email_site_title)} <#{source}>"
source
end
end