diff options
| author | Carl Lerche <carllerche@mac.com> | 2010-03-04 21:59:42 -0800 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2010-03-04 22:00:30 -0800 |
| commit | 9a17416d8bda0df0a6961e547c3cf1d677e66b5e (patch) | |
| tree | 4c6dba8298cc9f1e1224521edc696e66aeda82f9 /actionpack/lib/action_controller/metal | |
| parent | 48672cd1997618f21f50e1204e60dc681e647ddb (diff) | |
| download | rails-9a17416d8bda0df0a6961e547c3cf1d677e66b5e.tar.gz rails-9a17416d8bda0df0a6961e547c3cf1d677e66b5e.tar.bz2 rails-9a17416d8bda0df0a6961e547c3cf1d677e66b5e.zip | |
Tweak out url_for uses :script_name and add some tests
Diffstat (limited to 'actionpack/lib/action_controller/metal')
| -rw-r--r-- | actionpack/lib/action_controller/metal/url_for.rb | 6 |
1 files changed, 1 insertions, 5 deletions
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 |