diff options
-rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index d61b430f68..52cca3e667 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -654,7 +654,13 @@ module ActionDispatch def url_for(options) options = default_url_options.merge(options || {}) - user, password = extract_authentication(options) + user = password = nil + + if options[:user] && options[:password] + user = options.delete :user + password = options.delete :password + end + recall = options.delete(:_recall) original_script_name = options.delete(:original_script_name).presence |