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/controllers/help_controller.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/controllers/help_controller.rb')
| -rw-r--r-- | app/controllers/help_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index c7affd57c..ba04b7e22 100644 --- a/app/controllers/help_controller.rb +++ b/app/controllers/help_controller.rb @@ -20,7 +20,7 @@ class HelpController < ApplicationController end def contact - @contact_email = MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') + @contact_email = Configuration::contact_email @contact_email = @contact_email.gsub(/@/, "@") # if they clicked remove for link to request/body, remove it |