diff options
| author | Dmitry Polushkin <dmitry.polushkin@gmail.com> | 2011-10-05 17:35:59 +0100 |
|---|---|---|
| committer | Dmitry Polushkin <dmitry.polushkin@gmail.com> | 2011-10-05 17:35:59 +0100 |
| commit | 84eece0a823e9c601ea99a8709f24605a19bcbfd (patch) | |
| tree | 12ac66c6404f35faddd06617987ad6db76b11406 /actionpack/lib/action_dispatch/http/url.rb | |
| parent | 19965402b2f868c79d78269ca17cb6282f271382 (diff) | |
| parent | c495bfc127405f7ead0d1c275c4d75682a51e00e (diff) | |
| download | rails-84eece0a823e9c601ea99a8709f24605a19bcbfd.tar.gz rails-84eece0a823e9c601ea99a8709f24605a19bcbfd.tar.bz2 rails-84eece0a823e9c601ea99a8709f24605a19bcbfd.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_dispatch/http/url.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/url.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb index caa1decb9e..170c68f3e0 100644 --- a/actionpack/lib/action_dispatch/http/url.rb +++ b/actionpack/lib/action_dispatch/http/url.rb @@ -64,14 +64,16 @@ module ActionDispatch end def host_or_subdomain_and_domain(options) - return options[:host] unless options[:subdomain] || options[:domain] + return options[:host] if options[:subdomain].nil? && options[:domain].nil? tld_length = options[:tld_length] || @@tld_length host = "" - host << (options[:subdomain] || extract_subdomain(options[:host], tld_length)) - host << "." - host << (options[:domain] || extract_domain(options[:host], tld_length)) + unless options[:subdomain] == false + host << (options[:subdomain] || extract_subdomain(options[:host], tld_length)) + host << "." + end + host << (options[:domain] || extract_domain(options[:host], tld_length)) host end end |