diff options
| -rw-r--r-- | actionpack/lib/action_controller/metal/url_for.rb | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb index ef1071bb3d..333eeaeffb 100644 --- a/actionpack/lib/action_controller/metal/url_for.rb +++ b/actionpack/lib/action_controller/metal/url_for.rb @@ -5,17 +5,19 @@ module ActionController include AbstractController::UrlFor def url_options - @_url_options ||= begin - options = {} - if _routes.equal?(env["action_dispatch.routes"]) + @_url_options ||= super.reverse_merge( + :host => request.host_with_port, + :protocol => request.protocol, + :_path_segments => request.symbolized_path_parameters + ).freeze + + if _routes.equal?(env["action_dispatch.routes"]) + @_url_options.dup.tap do |options| options[:script_name] = request.script_name.dup + options.freeze end - - super.merge(options).reverse_merge( - :host => request.host_with_port, - :protocol => request.protocol, - :_path_segments => request.symbolized_path_parameters - ).freeze + else + @_url_options end end end |