From 900a2d304a83bad7a3958464b8dfa6fb49670686 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Thu, 4 Mar 2010 17:43:46 -0800
Subject: Get rid of relative_url_path in favor of respecting SCRIPT_NAME. Also
 added a way to specify a default SCRIPT_NAME when generating URLs out of the
 context of a request.

---
 actionpack/lib/action_controller/url_rewriter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_controller/url_rewriter.rb')

diff --git a/actionpack/lib/action_controller/url_rewriter.rb b/actionpack/lib/action_controller/url_rewriter.rb
index 973a6facd7..8821892b3a 100644
--- a/actionpack/lib/action_controller/url_rewriter.rb
+++ b/actionpack/lib/action_controller/url_rewriter.rb
@@ -32,7 +32,7 @@ module ActionController
 
       # ROUTES TODO: Fix the tests
       segments = options.delete(:_path_segments)
-      relative_url_root = options.delete(:relative_url_root).to_s
+      relative_url_root = options.delete(:script_name).to_s
       path_segments = path_segments ? path_segments.merge(segments || {}) : segments
 
       unless options[:only_path]
-- 
cgit v1.2.3