diff options
| author | David Cabo <david@calibea.com> | 2011-10-13 00:29:51 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-10-13 00:29:51 +0200 |
| commit | c8983b923e4dc7db9ba22156daaddd94d2b5ed4d (patch) | |
| tree | 7741c3655fe5e3cbc90dd20a4626ac7acc1bf6b0 /app/models/application_mailer.rb | |
| parent | a29b3aaf0ae77af49d38813b62dddcb6889c1ebe (diff) | |
| parent | e13127a8ebc8bf8379d92f778af5a2bb6931d80c (diff) | |
Merge branch 'release/0.4'0.4
Diffstat (limited to 'app/models/application_mailer.rb')
| -rw-r--r-- | app/models/application_mailer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/application_mailer.rb b/app/models/application_mailer.rb index 9628d7339..e9f82a2c3 100644 --- a/app/models/application_mailer.rb +++ b/app/models/application_mailer.rb @@ -15,8 +15,8 @@ class ApplicationMailer < ActionMailer::Base self.raise_delivery_errors = true def contact_from_name_and_email - contact_name = MySociety::Config.get("CONTACT_NAME", 'contact@localhost') - contact_email = MySociety::Config.get("CONTACT_EMAIL", 'Alaveteli') + contact_name = MySociety::Config.get("CONTACT_NAME", 'Alaveteli') + contact_email = MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') return "#{contact_name} <#{contact_email}>" end |