diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-21 01:09:15 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-21 01:09:15 +0000 |
| commit | 1677404893bb7e58c8e7529299840c938a868cbb (patch) | |
| tree | 111017796be6eb412a0c36e96ff8cdb6c0c3d85b /actionpack/lib/action_controller/routing.rb | |
| parent | 48a44b77c138826e9ffaecd6fc63627d3f670086 (diff) | |
| download | rails-1677404893bb7e58c8e7529299840c938a868cbb.tar.gz rails-1677404893bb7e58c8e7529299840c938a868cbb.tar.bz2 rails-1677404893bb7e58c8e7529299840c938a868cbb.zip | |
Fixed more caching and routing love
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@728 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/routing.rb')
| -rw-r--r-- | actionpack/lib/action_controller/routing.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index a806b995c0..f97956d040 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -214,11 +214,10 @@ 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) defaults.delete_if {|k, v| options.key?(k) && options[k].nil?} # Remove defaults that have been manually cleared using :name => nil - options = defaults if options.empty? # Get back the current url if no options was passed - failures = [] selected = nil self.each do |route| |