aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing
diff options
context:
space:
mode:
authorKamil Sobieraj <ksobej@gmail.com>2011-10-04 09:16:34 +0100
committerKamil Sobieraj <ksobej@gmail.com>2011-10-04 09:16:34 +0100
commitde942e5534a26942e261a7699adc28597c5ad1bc (patch)
treec326ef6b47d71a763d7a635c5496dd99739af1c1 /actionpack/lib/action_dispatch/routing
parent1eac9119620e9b537c1eca9619d4fa3ecb546149 (diff)
downloadrails-de942e5534a26942e261a7699adc28597c5ad1bc.tar.gz
rails-de942e5534a26942e261a7699adc28597c5ad1bc.tar.bz2
rails-de942e5534a26942e261a7699adc28597c5ad1bc.zip
:subdomain can now be specified with a value of false in url_for, allowing for subdomain(s) removal from the host during link generation. Closes #2025
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
-rw-r--r--actionpack/lib/action_dispatch/routing/url_for.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index 30048cd48a..8fc8dc191b 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -116,9 +116,10 @@ module ActionDispatch
# If <tt>:only_path</tt> is false, this option must be
# provided either explicitly, or via +default_url_options+.
# * <tt>:subdomain</tt> - Specifies the subdomain of the link, using the +tld_length+
- # to split the domain from the host.
- # * <tt>:domain</tt> - Specifies the domain of the link, using the +tld_length+
# to split the subdomain from the host.
+ # If false, removes all subdomains from the host part of the link.
+ # * <tt>:domain</tt> - Specifies the domain of the link, using the +tld_length+
+ # to split the domain from the host.
# * <tt>:tld_length</tt> - Number of labels the TLD id composed of, only used if
# <tt>:subdomain</tt> or <tt>:domain</tt> are supplied. Defaults to
# <tt>ActionDispatch::Http::URL.tld_length</tt>, which in turn defaults to 1.