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

Use String#+@ before mutating the result of Symbol#to_s

Follow up #37303.

https://buildkite.com/rails/rails/builds/63957#dc16cd12-10a2-435c-9b64-b8332114d92a/981-1293
This commit is contained in:
Ryuta Kamizono 2019-09-28 15:53:20 +09:00
parent 63299ce7a3
commit bc7ed042c4
2 changed files with 4 additions and 3 deletions

View file

@ -115,7 +115,7 @@ module ActionController
if m.respond_to?(:nested_attributes_options) && m.nested_attributes_options.keys.any?
self.include += m.nested_attributes_options.keys.map do |key|
key.to_s.concat("_attributes")
(+key.to_s).concat("_attributes")
end
end

View file

@ -455,6 +455,7 @@ module ActionController
def process(action, method: "GET", params: nil, session: nil, body: nil, flash: {}, format: nil, xhr: false, as: nil)
check_required_ivars
action = +action.to_s
http_method = method.to_s.upcase
@html_document = nil
@ -486,11 +487,11 @@ module ActionController
parameters[:format] = format
end
generated_extras = @routes.generate_extras(parameters.merge(controller: controller_class_name, action: action.to_s))
generated_extras = @routes.generate_extras(parameters.merge(controller: controller_class_name, action: action))
generated_path = generated_path(generated_extras)
query_string_keys = query_parameter_names(generated_extras)
@request.assign_parameters(@routes, controller_class_name, action.to_s, parameters, generated_path, query_string_keys)
@request.assign_parameters(@routes, controller_class_name, action, parameters, generated_path, query_string_keys)
@request.session.update(session) if session
@request.flash.update(flash || {})