TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

stop referencing env in url_for

Browse Source 
encapsulate env in the request so that we can eventually move away from
the env hash
This commit is contained in:
Aaron Patterson 2014-12-30 15:18:20 -08:00
parent 87a7591064
commit 4080dd2f24
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/action_controller/metal/url_for.rb
View File

@ -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

4
actionpack/lib/action_dispatch/http/request.rb
View File

@ -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