stop referencing env
in url_for
encapsulate env in the request so that we can eventually move away from the env hash
This commit is contained in:
parent
87a7591064
commit
4080dd2f24
@ -31,7 +31,7 @@ def url_options
|
||||
}.merge!(super).freeze
|
||||
|
||||
if (same_origin = _routes.equal?(request.routes)) ||
|
||||
(script_name = env["ROUTES_#{_routes.object_id}_SCRIPT_NAME"]) ||
|
||||
(script_name = request.engine_script_name(_routes)) ||
|
||||
(original_script_name = request.original_script_name)
|
||||
|
||||
options = @_url_options.dup
|
||||
|
@ -113,6 +113,10 @@ def original_script_name # :nodoc:
|
||||
env['ORIGINAL_SCRIPT_NAME'.freeze]
|
||||
end
|
||||
|
||||
def engine_script_name(_routes) # :nodoc:
|
||||
env["ROUTES_#{_routes.object_id}_SCRIPT_NAME"]
|
||||
end
|
||||
|
||||
def request_method=(request_method) #:nodoc:
|
||||
if check_method(request_method)
|
||||
@request_method = env["REQUEST_METHOD"] = request_method
|
||||
|
Loading…
Reference in New Issue
Block a user