diff options
| author | Andrew White <andrew.white@unboxed.co> | 2017-11-28 15:58:18 +0000 |
|---|---|---|
| committer | Andrew White <andrew.white@unboxed.co> | 2017-11-28 15:58:18 +0000 |
| commit | 00c0e4001cc875a51938a3086129b4dc275eef93 (patch) | |
| tree | eacff1a575876430b74b77ea1334aba1fa6cf5cb /actionpack/lib | |
| parent | 349f00beaa16f6b5eec3de7d3be8e9b72313a92f (diff) | |
| download | rails-00c0e4001cc875a51938a3086129b4dc275eef93.tar.gz rails-00c0e4001cc875a51938a3086129b4dc275eef93.tar.bz2 rails-00c0e4001cc875a51938a3086129b4dc275eef93.zip | |
Fix optimized url helpers when using relative url root
Fixes #31220.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 987e709f6f..9eff30fa53 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -199,6 +199,16 @@ module ActionDispatch if args.size == arg_size && !inner_options && optimize_routes_generation?(t) options = t.url_options.merge @options options[:path] = optimized_helper(args) + + original_script_name = options.delete(:original_script_name) + script_name = t._routes.find_script_name(options) + + if original_script_name + script_name = original_script_name + script_name + end + + options[:script_name] = script_name + url_strategy.call options else super |