1
0
Fork 0
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:
Aaron Patterson 2014-05-21 15:51:28 -07:00
parent 4d1b3a1312
commit 40e77636a3

View file

@ -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"]) ||