diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-07-31 09:43:02 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-07-31 09:43:02 -0300 |
| commit | a9c0eb439263a10937918a32b19d23478245d7f8 (patch) | |
| tree | ca1cedf470695428a247577e260f1a36d49e6303 /actionpack | |
| parent | 4e09c509afcfdae2c1cee7dabebcf8a0bf20bce0 (diff) | |
| download | rails-a9c0eb439263a10937918a32b19d23478245d7f8.tar.gz rails-a9c0eb439263a10937918a32b19d23478245d7f8.tar.bz2 rails-a9c0eb439263a10937918a32b19d23478245d7f8.zip | |
Avoid a new hash object
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/metal/url_for.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb index 07265be3fe..dc742ce466 100644 --- a/actionpack/lib/action_controller/metal/url_for.rb +++ b/actionpack/lib/action_controller/metal/url_for.rb @@ -28,7 +28,7 @@ module ActionController :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"]) || |