1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

we don't really need an extra method to set the script name

This commit is contained in:
Aaron Patterson 2015-07-10 11:52:51 -07:00
parent 85903d1b08
commit 3c5bd78ddb

View file

@ -506,7 +506,7 @@ module ActionController
@controller.request = @request @controller.request = @request
@controller.response = @response @controller.response = @response
build_request_uri(controller_class_name, action, parameters) @request.env["SCRIPT_NAME"] ||= @controller.config.relative_url_root
@controller.recycle! @controller.recycle!
@controller.process(action) @controller.process(action)
@ -631,10 +631,6 @@ module ActionController
end end
end end
def build_request_uri(controller_class_name, action, parameters)
@request.env["SCRIPT_NAME"] ||= @controller.config.relative_url_root
end
def html_format?(parameters) def html_format?(parameters)
return true unless parameters.key?(:format) return true unless parameters.key?(:format)
Mime.fetch(parameters[:format]) { Mime['html'] }.html? Mime.fetch(parameters[:format]) { Mime['html'] }.html?