Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-05 08:59:27 +08:00
Code Packages Activity Actions 11

FIX: use email_site_title for emails like reset password and account activation too

Browse source
This commit is contained in:
Neil Lalonde 2014-07-22 15:52:14 -04:00
parent dffe528400
commit b3c149de22
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/email/message_builder.rb
View file

@ -163,8 +163,12 @@ module Email
end
def alias_email(source)
return source if @opts[:from_alias].blank?
"#{@opts[:from_alias]} <#{source}>"
return source if @opts[:from_alias].blank? && SiteSetting.email_site_title.blank?
if !@opts[:from_alias].blank?
"#{@opts[:from_alias]} <#{source}>"
else
"#{SiteSetting.email_site_title} <#{source}>"
end
end
def site_alias_email(source)