From 5760a6cb3e3f3ce3b41c25023f3fbb875590c5bc Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Fri, 18 Feb 2005 23:53:18 +0000
Subject: Clear route defaults using :name => nil #663

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@671 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/lib/action_controller/routing.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack/lib/action_controller/routing.rb')

diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb
index 1f4d56ec01..1206fda5ec 100644
--- a/actionpack/lib/action_controller/routing.rb
+++ b/actionpack/lib/action_controller/routing.rb
@@ -176,6 +176,7 @@ module ActionController
         options = options.symbolize_keys
         defaults = request.path_parameters.symbolize_keys
         expand_controller_path!(options, defaults)
+        defaults.delete_if {|k, v| options.key?(k) && options[k].nil?} # Remove defaults that have been manually cleared using :name => nil
 
         failures = []
         selected = nil
-- 
cgit v1.2.3