diff options
| author | Yasyf Mohamedali <yasyfm@gmail.com> | 2015-02-24 16:04:27 -0500 |
|---|---|---|
| committer | Yasyf Mohamedali <yasyfm@gmail.com> | 2015-02-24 16:04:27 -0500 |
| commit | 6c14252d2cc28b97ba708971a3ad235537bcdf02 (patch) | |
| tree | 9b5e4be9628b3f20715fe9fd97443c170cc6f77e /actionpack/lib/action_dispatch/routing/route_set.rb | |
| parent | 2bc72ae29c660a2d9bf6b1b42db4fe18f0d1492f (diff) | |
| download | rails-6c14252d2cc28b97ba708971a3ad235537bcdf02.tar.gz rails-6c14252d2cc28b97ba708971a3ad235537bcdf02.tar.bz2 rails-6c14252d2cc28b97ba708971a3ad235537bcdf02.zip | |
Fallback to RAILS_RELATIVE_URL_ROOT in `url_for`.
Fixed an issue where the `RAILS_RELATIVE_URL_ROOT` environment
variable is not prepended to the path when `url_for` is called.
If `SCRIPT_NAME` (used by Rack) is set, it takes precedence.
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/route_set.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index ce04f0b08a..da6a00304c 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -20,6 +20,8 @@ module ActionDispatch # alias inspect to to_s. alias inspect to_s + mattr_accessor :relative_url_root + class Dispatcher < Routing::Endpoint def initialize(defaults) @defaults = defaults @@ -693,7 +695,7 @@ module ActionDispatch end def find_script_name(options) - options.delete(:script_name) || '' + options.delete(:script_name) || relative_url_root || '' end def path_for(options, route_name = nil) |