mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
we can just use Ruby here
This commit is contained in:
parent
4d1b3a1312
commit
40e77636a3
1 changed files with 2 additions and 2 deletions
|
@ -23,12 +23,12 @@ module ActionController
|
|||
include AbstractController::UrlFor
|
||||
|
||||
def url_options
|
||||
@_url_options ||= super.reverse_merge(
|
||||
@_url_options ||= {
|
||||
:host => request.host,
|
||||
:port => request.optional_port,
|
||||
:protocol => request.protocol,
|
||||
:_recall => request.symbolized_path_parameters
|
||||
).freeze
|
||||
}.merge(super).freeze
|
||||
|
||||
if (same_origin = _routes.equal?(env["action_dispatch.routes".freeze])) ||
|
||||
(script_name = env["ROUTES_#{_routes.object_id}_SCRIPT_NAME"]) ||
|
||||
|
|
Loading…
Reference in a new issue