diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-01 11:03:52 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-01 11:03:52 +0100 |
| commit | be96333dafd0fa0623ca4495237c8c6fa5457c14 (patch) | |
| tree | 6a0dbc34767db4a49ea9231738fe17dd1df6934a /app/helpers/mailer_helper.rb | |
| parent | 3cfa6c4d1c4ae6ba5e3f22ff8757d1ec9dcd8b68 (diff) | |
| parent | 6ee1e8d0a4a8cfe02797c1a853bf27af2610ad27 (diff) | |
Merge remote-tracking branch 'openaustralia_github/configuration_refactor' into develop
Conflicts:
config/general.yml-example
Diffstat (limited to 'app/helpers/mailer_helper.rb')
| -rw-r--r-- | app/helpers/mailer_helper.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/helpers/mailer_helper.rb b/app/helpers/mailer_helper.rb index c0a950d47..be2ce47aa 100644 --- a/app/helpers/mailer_helper.rb +++ b/app/helpers/mailer_helper.rb @@ -1,7 +1,5 @@ module MailerHelper def contact_from_name_and_email - contact_name = MySociety::Config.get("CONTACT_NAME", 'Alaveteli') - contact_email = MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') - return "#{contact_name} <#{contact_email}>" + "#{Configuration::contact_name} <#{Configuration::contact_email}>" end end |