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: surround the FROM alias with " in order to support the @ character

Browse source
This commit is contained in:
Régis Hanol 2017-03-07 23:37:21 +01:00
parent 0c03ccb01e
commit ee9d621d9c
3 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/email/message_builder.rb
View file

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