diff options
| author | Carlhuda <carlhuda@engineyard.com> | 2010-03-04 17:43:46 -0800 |
|---|---|---|
| committer | Carlhuda <carlhuda@engineyard.com> | 2010-03-04 17:43:46 -0800 |
| commit | 900a2d304a83bad7a3958464b8dfa6fb49670686 (patch) | |
| tree | 0890d17f239ac85509ed74a93b76c6409a7b1f38 /actionpack/lib/action_controller/metal | |
| parent | 3438373f038cefda664b879f49eec8aec6a15a76 (diff) | |
| download | rails-900a2d304a83bad7a3958464b8dfa6fb49670686.tar.gz rails-900a2d304a83bad7a3958464b8dfa6fb49670686.tar.bz2 rails-900a2d304a83bad7a3958464b8dfa6fb49670686.zip | |
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.
Diffstat (limited to 'actionpack/lib/action_controller/metal')
| -rw-r--r-- | actionpack/lib/action_controller/metal/url_for.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb index c890dc51d4..89ab0b4753 100644 --- a/actionpack/lib/action_controller/metal/url_for.rb +++ b/actionpack/lib/action_controller/metal/url_for.rb @@ -12,7 +12,7 @@ module ActionController # ROUTES TODO: relative_url_root should be middleware # and the generator should take SCRIPT_NAME into # consideration - :relative_url_root => config.relative_url_root, + :script_name => request.env["SCRIPT_NAME"], :_path_segments => request.symbolized_path_parameters ) end |