@request is nil

mbleigh · Sep 10, 2010 · a97f2e0 · a97f2e0
1 parent a4996cd
commit a97f2e0
Showing 1 changed file with 2 additions and 3 deletions.
diff --git 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)