Merge pull request #433 from henare/issue-271

Closes Issue 271

1 files changed, 4 insertions, 12 deletions

diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index 961fa3cbb..a18af8c69 100644
--- a/app/models/public_body.rb
+++ b/app/models/public_body.rb
@@ -282,19 +282,11 @@ class PublicBody < ActiveRecord::Base
     # Guess home page from the request email, or use explicit override, or nil
     # if not known.
     def calculated_home_page
-        # manual override for ones we calculate wrongly
-        if self.home_page != ''
-            return self.home_page
+        if home_page && !home_page.empty?
+            home_page[URI::regexp(%w(http https))] ? home_page : "http://#{home_page}"
+        elsif request_email_domain
+            "http://www.#{request_email_domain}"
         end
-
-        # extract the domain name from the FOI request email
-        url = self.request_email_domain
-        if url.nil?
-            return nil
-        end
-
-        # add standard URL prefix
-        return "http://www." + url
     end
 
     # Are all requests to this body under the Environmental Information Regulations?