aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/http/url.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-04 20:05:35 +0200
committerJosé Valim <jose.valim@gmail.com>2011-05-04 20:05:35 +0200
commit6b79463ed8d04c7807c0695fcb3d4c11e4be9fa2 (patch)
treef2fdbdf2abedea3cd619ece126918910c8bdd86a /actionpack/lib/action_dispatch/http/url.rb
parenta93bd11b1d90da5abdef11c2774bb9bafe27bfb1 (diff)
downloadrails-6b79463ed8d04c7807c0695fcb3d4c11e4be9fa2.tar.gz
rails-6b79463ed8d04c7807c0695fcb3d4c11e4be9fa2.tar.bz2
rails-6b79463ed8d04c7807c0695fcb3d4c11e4be9fa2.zip
Fix .subdomain regression.
Diffstat (limited to 'actionpack/lib/action_dispatch/http/url.rb')
-rw-r--r--actionpack/lib/action_dispatch/http/url.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index ac0fd9607d..d9c07d6ca3 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -165,7 +165,7 @@ module ActionDispatch
# such as 2 to catch <tt>["www"]</tt> instead of <tt>"www.rubyonrails"</tt>
# in "www.rubyonrails.co.uk".
def subdomain(tld_length = @@tld_length)
- subdomains(tld_length)
+ subdomains(tld_length).join(".")
end
end
end