diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-21 01:01:24 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-21 01:01:24 +0000 |
| commit | 48a44b77c138826e9ffaecd6fc63627d3f670086 (patch) | |
| tree | f8228141bde6559a93c2ad3281c3db0519678d7f /actionpack/lib/action_controller/routing.rb | |
| parent | 824558816acb7b930624e3cbd4dae8e7413e12f4 (diff) | |
| download | rails-48a44b77c138826e9ffaecd6fc63627d3f670086.tar.gz rails-48a44b77c138826e9ffaecd6fc63627d3f670086.tar.bz2 rails-48a44b77c138826e9ffaecd6fc63627d3f670086.zip | |
Fixed caching for root and Routing for getting back the current url
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@727 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, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index 18645ae4e0..a806b995c0 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -211,11 +211,14 @@ module ActionController # Note that we *do* return immediately if def generate(options, request) raise RoutingError, "There are no routes defined!" if @routes.empty? + 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 + options = defaults if options.empty? # Get back the current url if no options was passed + failures = [] selected = nil self.each do |route| |