From 9a17416d8bda0df0a6961e547c3cf1d677e66b5e Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Thu, 4 Mar 2010 21:59:42 -0800
Subject: Tweak out url_for uses :script_name and add some tests

---
 actionpack/lib/action_controller/metal/url_for.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'actionpack/lib/action_controller/metal')

diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb
index 89ab0b4753..f6b6cb2ff4 100644
--- a/actionpack/lib/action_controller/metal/url_for.rb
+++ b/actionpack/lib/action_controller/metal/url_for.rb
@@ -9,12 +9,8 @@ module ActionController
       super.reverse_merge(
         :host => request.host_with_port,
         :protocol => request.protocol,
-        # ROUTES TODO: relative_url_root should be middleware
-        # and the generator should take SCRIPT_NAME into
-        # consideration
-        :script_name => request.env["SCRIPT_NAME"],
         :_path_segments => request.symbolized_path_parameters
-      )
+      ).merge(:script_name => request.script_name)
     end
 
     def _router
-- 
cgit v1.2.3