diff options
author | Henare Degan <henare.degan@gmail.com> | 2012-02-16 20:38:48 +1100 |
---|---|---|
committer | Henare Degan <henare.degan@gmail.com> | 2012-02-16 20:38:48 +1100 |
commit | 8a09eb837849468f291990f7d92b382a6e08ebae (patch) | |
tree | 6d3657dc25b59134a3b3b4f1e50196f77088ad49 | |
parent | 8489d3849dc65a2f5e87c5cca9ecca6526517a54 (diff) |
Don't add extra www characters to web addresses that have been explicitly defined
-rw-r--r-- | app/models/public_body.rb | 2 | ||||
-rw-r--r-- | spec/models/public_body_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb index f8c12e1e8..74c079eaa 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -283,7 +283,7 @@ class PublicBody < ActiveRecord::Base # if not known. def calculated_home_page if home_page && !home_page.empty? - home_page[0..10] == 'http://www.' ? home_page : "http://www.#{home_page}" + home_page[0..6] == 'http://' ? home_page : "http://#{home_page}" elsif request_email_domain "http://www.#{request_email_domain}" end diff --git a/spec/models/public_body_spec.rb b/spec/models/public_body_spec.rb index 142735cb0..9b8c78010 100644 --- a/spec/models/public_body_spec.rb +++ b/spec/models/public_body_spec.rb @@ -425,7 +425,7 @@ describe PublicBody do it "should ensure home page URLs start with http://" do public_body = PublicBody.new public_body.home_page = "example.com" - public_body.calculated_home_page.should == "http://www.example.com" + public_body.calculated_home_page.should == "http://example.com" end end end |