diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-21 15:51:28 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-21 15:51:28 -0700 |
| commit | 40e77636a301be57794e6656f865ef52979aa4e5 (patch) | |
| tree | a54851c4ced536e2b37db417f523cc9c97429ca6 /actionpack/lib/action_controller | |
| parent | 4d1b3a13129eb7d5fdb1564706acbcd25a5ffa9b (diff) | |
| download | rails-40e77636a301be57794e6656f865ef52979aa4e5.tar.gz rails-40e77636a301be57794e6656f865ef52979aa4e5.tar.bz2 rails-40e77636a301be57794e6656f865ef52979aa4e5.zip | |
we can just use Ruby here
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/url_for.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb index 37d4a96ee1..89c3545323 100644 --- a/actionpack/lib/action_controller/metal/url_for.rb +++ b/actionpack/lib/action_controller/metal/url_for.rb @@ -23,12 +23,12 @@ module ActionController include AbstractController::UrlFor def url_options - @_url_options ||= super.reverse_merge( + @_url_options ||= { :host => request.host, :port => request.optional_port, :protocol => request.protocol, :_recall => request.symbolized_path_parameters - ).freeze + }.merge(super).freeze if (same_origin = _routes.equal?(env["action_dispatch.routes".freeze])) || (script_name = env["ROUTES_#{_routes.object_id}_SCRIPT_NAME"]) || |