Avoid a new hash object

a9c0eb43 · Carlos Antonio da Silva · 4e09c509 · a9c0eb43
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

actionpack/lib/action_controller/metal/url_for.rb actionpack/lib/action_controller/metal/url_for.rb +1 -1

未找到文件。
--- a/actionpack/lib/action_controller/metal/url_for.rb
+++ b/actionpack/lib/action_controller/metal/url_for.rb
@@ -28,7 +28,7 @@ def url_options
        :port => request.optional_port,
        :protocol => request.protocol,
        :_recall => request.path_parameters
-      }.merge(super).freeze
+      }.merge!(super).freeze

      if (same_origin = _routes.equal?(env["action_dispatch.routes".freeze])) ||
         (script_name = env["ROUTES_#{_routes.object_id}_SCRIPT_NAME"]) ||