diff options
| -rw-r--r-- | actionpack/lib/action_controller/routing.rb | 5 | ||||
| -rw-r--r-- | actionpack/test/controller/routing_tests.rb | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index a522b34f73..d270defa4d 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -215,8 +215,9 @@ module ActionController options = options.symbolize_keys defaults = request.path_parameters.symbolize_keys - options = defaults if options.empty? # Get back the current url if no options was passed - expand_controller_path!(options, defaults) + if options.empty? then options = defaults.clone # Get back the current url if no options was passed + else expand_controller_path!(options, defaults) # Expand the supplied controller path. + end defaults.delete_if {|k, v| options.key?(k) && options[k].nil?} # Remove defaults that have been manually cleared using :name => nil failures = [] diff --git a/actionpack/test/controller/routing_tests.rb b/actionpack/test/controller/routing_tests.rb index 69fe6e2b2a..f1a3254a42 100644 --- a/actionpack/test/controller/routing_tests.rb +++ b/actionpack/test/controller/routing_tests.rb @@ -474,6 +474,11 @@ class RouteSetTests < Test::Unit::TestCase @request.path_parameters = {:controller => 'content', :action => 'action', :id => '10'} verify_generate 'content/action', {:id => nil} end + + def test_url_to_self + @request.path_parameters = {:controller => 'admin/users', :action => 'index'} + verify_generate 'admin/users', {} + end end #require '../assertions/action_pack_assertions.rb' |