aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2015-06-08 12:42:14 +0100
committerLouise Crow <louise.crow@gmail.com>2015-06-08 12:42:14 +0100
commit3efe2f333a9b143e88556c0aeedb534090eb41d3 (patch)
treea25c455239c3ee91b41b19f9a3af0546f920c9b3 /app
parent4da1e6620cf022040c9ac0c5192697b995a0b0b3 (diff)
parentad557e2ff04dd6a971ab51fe479745f357e81016 (diff)
Merge branch 'format-admin-form-from-address' into develop
Diffstat (limited to 'app')
-rw-r--r--app/mailers/contact_mailer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/mailers/contact_mailer.rb b/app/mailers/contact_mailer.rb
index 7c48bfd4b..58e036d3b 100644
--- a/app/mailers/contact_mailer.rb
+++ b/app/mailers/contact_mailer.rb
@@ -10,7 +10,7 @@ class ContactMailer < ApplicationMailer
def to_admin_message(name, email, subject, message, logged_in_user, last_request, last_body)
@message, @logged_in_user, @last_request, @last_body = message, logged_in_user, last_request, last_body
- mail(:from => "#{name} <#{email}>",
+ mail(:from => MailHandler.address_from_name_and_email(name, email),
:to => contact_from_name_and_email,
:subject => subject)
end