diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-11-21 03:30:06 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-11-21 03:30:06 +0100 |
| commit | 6af08ab6d835d1c2aa8648a0d3a4a86e678c3f52 (patch) | |
| tree | 96bd668692b62d3829322232877b70c9011ce446 /actionpack/lib/action_dispatch/http/url.rb | |
| parent | f326221c701e4f9d991e3eadcc793a73795fb218 (diff) | |
| parent | 7c51d1fcf9dc504c2dfd6e7184bbe8186f09819d (diff) | |
| download | rails-6af08ab6d835d1c2aa8648a0d3a4a86e678c3f52.tar.gz rails-6af08ab6d835d1c2aa8648a0d3a4a86e678c3f52.tar.bz2 rails-6af08ab6d835d1c2aa8648a0d3a4a86e678c3f52.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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb index 4da82f958a..9c9eed2c6d 100644 --- a/actionpack/lib/action_dispatch/http/url.rb +++ b/actionpack/lib/action_dispatch/http/url.rb @@ -2,6 +2,7 @@ module ActionDispatch module Http module URL mattr_accessor :tld_length + self.tld_length = 1 # Returns the complete URL used for this request. def url @@ -67,7 +68,7 @@ module ActionDispatch # Returns the \domain part of a \host, such as "rubyonrails.org" in "www.rubyonrails.org". You can specify # a different <tt>tld_length</tt>, such as 2 to catch rubyonrails.co.uk in "www.rubyonrails.co.uk". - def domain(tld_length = 1) + def domain(tld_length = @@tld_length) return nil unless named_host?(host) host.split('.').last(1 + tld_length).join('.') |