diff options
author | Carlhuda <carlhuda@engineyard.com> | 2010-03-02 17:20:13 -0800 |
---|---|---|
committer | Carlhuda <carlhuda@engineyard.com> | 2010-03-03 15:49:52 -0800 |
commit | bcfb77782b9d7f28f0c19005da909162e5e27690 (patch) | |
tree | 136ab5091182ae2b927d31f9a5453b050d647925 /actionpack/lib/action_controller/metal/url_for.rb | |
parent | 664090348154ccbf1274a13bbc3d3c37ba35bc7d (diff) | |
download | rails-bcfb77782b9d7f28f0c19005da909162e5e27690.tar.gz rails-bcfb77782b9d7f28f0c19005da909162e5e27690.tar.bz2 rails-bcfb77782b9d7f28f0c19005da909162e5e27690.zip |
Work on deprecating ActionController::Base.relative_url_root
Diffstat (limited to 'actionpack/lib/action_controller/metal/url_for.rb')
-rw-r--r-- | actionpack/lib/action_controller/metal/url_for.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb index 8a06f34d23..c890dc51d4 100644 --- a/actionpack/lib/action_controller/metal/url_for.rb +++ b/actionpack/lib/action_controller/metal/url_for.rb @@ -9,6 +9,10 @@ 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 + :relative_url_root => config.relative_url_root, :_path_segments => request.symbolized_path_parameters ) end |