From a97f2e0b455d43deddcd85a042743db83c1e9a27 Mon Sep 17 00:00:00 2001 From: "Igor P. Leroy" Date: Fri, 10 Sep 2010 17:31:01 -0300 Subject: [PATCH] @request is nil --- lib/subdomain_fu/url_rewriter.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/subdomain_fu/url_rewriter.rb b/lib/subdomain_fu/url_rewriter.rb index 85c3e21..9a3316f 100644 --- a/lib/subdomain_fu/url_rewriter.rb +++ b/lib/subdomain_fu/url_rewriter.rb @@ -4,10 +4,9 @@ module ActionDispatch module Routing class RouteSet #:nodoc: def url_for_with_subdomains(options, path_segments=nil) - raise @request.inspect - if SubdomainFu.needs_rewrite?(options[:subdomain], (options[:host] || @request.host_with_port)) || options[:only_path] == false + if SubdomainFu.needs_rewrite?(options[:subdomain], (options[:host] || "#{host}#{port_string}")) || options[:only_path] == false options[:only_path] = false if SubdomainFu.override_only_path? - options[:host] = SubdomainFu.rewrite_host_for_subdomains(options.delete(:subdomain), options[:host] || @request.host_with_port) + options[:host] = SubdomainFu.rewrite_host_for_subdomains(options.delete(:subdomain), options[:host] || "#{host}#{port_string}") # puts "options[:host]: #{options[:host].inspect}" else options.delete(:subdomain)