diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2017-11-28 17:00:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-28 17:00:26 +0000 |
| commit | 076d1621bbd8e254d66b6f47025961a1de16f30d (patch) | |
| tree | fd0af2b7bd6935ab2ab378430f736e9607df5b1f /actionpack/lib | |
| parent | f2b6406066888aaa10aba6c3cb95c2eb6dda760e (diff) | |
| parent | 00c0e4001cc875a51938a3086129b4dc275eef93 (diff) | |
| download | rails-076d1621bbd8e254d66b6f47025961a1de16f30d.tar.gz rails-076d1621bbd8e254d66b6f47025961a1de16f30d.tar.bz2 rails-076d1621bbd8e254d66b6f47025961a1de16f30d.zip | |
Merge pull request #31261 from rails/fix-relative-url-root-with-optimized-url-helpers
Fix optimized url helpers when using relative url root
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 |