From b3c149de225fd53ba2db106d94ee51f4879165a6 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Tue, 22 Jul 2014 15:52:14 -0400
Subject: [PATCH] FIX: use email_site_title for emails like reset password and
account activation too
---
lib/email/message_builder.rb | 8 ++++++--
spec/components/email/message_builder_spec.rb | 5 +++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/lib/email/message_builder.rb b/lib/email/message_builder.rb
index 7b32dac926d..310f97f9ea5 100644
--- a/lib/email/message_builder.rb
+++ b/lib/email/message_builder.rb
@@ -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)
diff --git a/spec/components/email/message_builder_spec.rb b/spec/components/email/message_builder_spec.rb
index 187febf36be..a5cb86f707b 100644
--- a/spec/components/email/message_builder_spec.rb
+++ b/spec/components/email/message_builder_spec.rb
@@ -242,6 +242,11 @@ describe Email::MessageBuilder do
expect(custom_aliased_from.build_args[:from]).to eq("Finn the Dog <#{finn_email}>")
end
+ it "email_site_title will be added if it's set" do
+ SiteSetting.stubs(:email_site_title).returns("The Forum")
+ expect(build_args[:from]).to eq("The Forum <#{SiteSetting.notification_email}>")
+ end
+
end
end