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

Fix email code & tests

Browse Source
This commit is contained in:
riking
2014-06-27 12:03:07 -07:00
parent 0051cd8919
commit da9048f3ea
5 changed files with 28 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/email/message_builder.rb
View File

@ -147,7 +147,6 @@ module Email
return @from_value if @from_value
@from_value = @opts[:from] || SiteSetting.notification_email
@from_value = alias_email(@from_value)
@from_value
end
def reply_by_email_address
@ -161,8 +160,6 @@ module Email
else
site_alias_email(@reply_by_email_address)
end
@reply_by_email_address
end
def alias_email(source)
@ -171,7 +168,7 @@ module Email
end
def site_alias_email(source)
return "#{SiteSetting.title} <#{source}>"
"#{SiteSetting.title} <#{source}>"
end
end