From 1b14bff81a9ab6654badf52b552f90c8fc3ab0e3 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 11 Jun 2014 13:55:46 -0700 Subject: rm `same_host?`. The same conditional is two lines down. --- actionpack/lib/action_dispatch/http/url.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'actionpack/lib/action_dispatch/http') diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb index 6112ab2fd6..97cd32a308 100644 --- a/actionpack/lib/action_dispatch/http/url.rb +++ b/actionpack/lib/action_dispatch/http/url.rb @@ -102,10 +102,6 @@ module ActionDispatch host && IP_HOST_REGEXP !~ host end - def same_host?(options) - (options[:subdomain] == true || !options.key?(:subdomain)) && options[:domain].nil? - end - def normalize_protocol(protocol) case protocol when nil @@ -120,12 +116,14 @@ module ActionDispatch end def normalize_host(_host, options) - return _host if !named_host?(_host) || same_host?(options) + return _host if !named_host?(_host) tld_length = options[:tld_length] || @@tld_length host = "" if options[:subdomain] == true || !options.key?(:subdomain) + return _host if options[:domain].nil? + host << extract_subdomain(_host, tld_length).to_param elsif options[:subdomain].present? host << options[:subdomain].to_param -- cgit v1.2.3