diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-03 13:21:58 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-03 13:21:58 +0100 |
| commit | 6e32fcc8b7795709dadcc67461cf2d0d4f0f473e (patch) | |
| tree | 49c5ad3bd7a527c239e3ced5d1f7e7eea1842ad4 | |
| parent | 848df48c8d0cbf5c053c263397c68c5ee8b5dd21 (diff) | |
| parent | e8bebdba1f9ffc9e3704cfe80745dd9f5b7bab3e (diff) | |
Merge remote-tracking branch 'openaustralia_github/configuration_refactor' into develop
| -rw-r--r-- | app/models/public_body.rb | 2 | ||||
| -rw-r--r-- | lib/configuration.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb index d212c371f..34bcd332c 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -511,7 +511,7 @@ class PublicBody < ActiveRecord::Base # Returns nil if configuration variable not set def override_request_email - e = MySociety::Config.get("OVERRIDE_ALL_PUBLIC_BODY_REQUEST_EMAILS", "") + e = Configuration::override_all_public_body_request_emails e if e != "" end diff --git a/lib/configuration.rb b/lib/configuration.rb index 03ca62343..e52f6e956 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -31,6 +31,7 @@ module Configuration :ISO_COUNTRY_CODE => 'GB', :MAX_REQUESTS_PER_USER_PER_DAY => nil, :NEW_RESPONSE_REMINDER_AFTER_DAYS => [3, 10, 24], + :OVERRIDE_ALL_PUBLIC_BODY_REQUEST_EMAILS => '', :RAW_EMAILS_LOCATION => 'files/raw_emails', :READ_ONLY => '', :RECAPTCHA_PRIVATE_KEY => 'x', |