aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'app/models')
-rw-r--r--app/models/public_body.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index d1ed74110..841e1e881 100644
--- a/app/models/public_body.rb
+++ b/app/models/public_body.rb
@@ -509,12 +509,14 @@ class PublicBody < ActiveRecord::Base
return self.request_email_domain
end
+ # Returns nil if configuration variable not set
def override_request_email
- MySociety::Config.get("OVERRIDE_ALL_PUBLIC_BODY_REQUEST_EMAILS", "")
+ e = MySociety::Config.get("OVERRIDE_ALL_PUBLIC_BODY_REQUEST_EMAILS", "")
+ e if e != ""
end
def request_email
- if override_request_email != ""
+ if override_request_email
override_request_email
else
read_attribute(:request_email)