aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-09-23 22:52:57 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-09-23 22:52:57 +0000
commitcb5b8a7f055966c1f3e2d65d09c1b914e82d2c39 (patch)
tree1da909365ccec0d80a950946e228c751effbebd6 /actionpack/lib/action_controller
parentab09984d4ac6c99cad8e984dd0d9771790fa1d1d (diff)
downloadrails-cb5b8a7f055966c1f3e2d65d09c1b914e82d2c39.tar.gz
rails-cb5b8a7f055966c1f3e2d65d09c1b914e82d2c39.tar.bz2
rails-cb5b8a7f055966c1f3e2d65d09c1b914e82d2c39.zip
Optimized named routes respect AbstractRequest.relative_url_root. Closes #9612.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7605 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/routing_optimisation.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/routing_optimisation.rb b/actionpack/lib/action_controller/routing_optimisation.rb
index fdd5a81c19..71cfcbd935 100644
--- a/actionpack/lib/action_controller/routing_optimisation.rb
+++ b/actionpack/lib/action_controller/routing_optimisation.rb
@@ -75,6 +75,8 @@ module ActionController
elements << '#{request.host_with_port}'
end
+ elements << '#{request.relative_url_root if request && request.relative_url_root}'
+
# The last entry in route.segments appears to # *always* be a
# 'divider segment' for '/' but we have assertions to ensure that
# we don't include the trailing slashes, so skip them.