:subdomain can now be specified with a value of false in url_for, all…

…owing for subdomain(s) removal from the host during link generation. Closes rails#2025
ksob · Oct 4, 2011 · 28de950 · 28de950
1 parent bd0695c
commit 28de950
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
@@ -64,7 +64,7 @@ def rewrite_authentication(options)
         end
 
         def host_or_subdomain_and_domain(options)
-          return options[:host] if options[:subdomain].nil? && options[:domain].nil? #options[:subdomain] || options[:subdomain] == false || options[:domain]
+          return options[:host] if options[:subdomain].nil? && options[:domain].nil?
 
           tld_length = options[:tld_length] || @@tld_length