Permalink
Browse files

we can just use Ruby here

  • Loading branch information...
1 parent 4d1b3a1 commit 40e77636a301be57794e6656f865ef52979aa4e5 @tenderlove tenderlove committed May 21, 2014
Showing with 2 additions and 2 deletions.
  1. +2 −2 actionpack/lib/action_controller/metal/url_for.rb
View
4 actionpack/lib/action_controller/metal/url_for.rb
@@ -23,12 +23,12 @@ module UrlFor
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"]) ||

0 comments on commit 40e7763

Please sign in to comment.