From 5f67cfeda116f2b932ef72781420aa37e62437ca Mon Sep 17 00:00:00 2001 From: choonkeat Date: Wed, 14 Dec 2011 22:43:42 +0800 Subject: Fix url_for options[:subdomain] to allow objects as values * e.g. blog_url(subdomain: current_user) instead of blog_url(subdomain: current_user.to_param) --- actionpack/lib/action_dispatch/http/url.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_dispatch') diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb index 129a8b1031..64459836b5 100644 --- a/actionpack/lib/action_dispatch/http/url.rb +++ b/actionpack/lib/action_dispatch/http/url.rb @@ -70,7 +70,7 @@ module ActionDispatch host = "" unless options[:subdomain] == false - host << (options[:subdomain] || extract_subdomain(options[:host], tld_length)) + host << (options[:subdomain] || extract_subdomain(options[:host], tld_length)).to_param host << "." end host << (options[:domain] || extract_domain(options[:host], tld_length)) -- cgit v1.2.3