aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/user_mailer.rb
diff options
context:
space:
mode:
authorfrancis <francis>2008-01-14 12:22:36 +0000
committerfrancis <francis>2008-01-14 12:22:36 +0000
commit3e6bf84fa8743803b8995e0ebfe25dc1b9bb75cc (patch)
treea3a748f112238cfe811cbf5f2aeebfa8171be119 /app/models/user_mailer.rb
parent56e8b64cb30171cee4a8c279af3f9d6b8627b23b (diff)
Put name (as well as email) in all addresses when sending emails.
Diffstat (limited to 'app/models/user_mailer.rb')
-rw-r--r--app/models/user_mailer.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/app/models/user_mailer.rb b/app/models/user_mailer.rb
index 46baa19c4..74309a91d 100644
--- a/app/models/user_mailer.rb
+++ b/app/models/user_mailer.rb
@@ -4,13 +4,11 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: user_mailer.rb,v 1.4 2008-01-14 10:43:30 francis Exp $
-
-class UserMailer < ActionMailer::Base
- helper :application
+# $Id: user_mailer.rb,v 1.5 2008-01-14 12:22:36 francis Exp $
+class UserMailer < ApplicationMailer
def confirm_login(user, reasons, url)
- @from = "GovernmentSpy <"+MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost')+">"
+ @from = contact_from_name_and_email
@recipients = user.name_and_email
@subject = reasons[:email_subject]
@body[:reasons] = reasons