diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2005-07-18 03:12:45 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2005-07-18 03:12:45 +0000 |
| commit | 741316dc7123e8cdd750642dff6f39257d0ddbec (patch) | |
| tree | 625a9fa623e03c1fb987088195dc13ea82336e25 /actionpack/lib/action_controller/routing.rb | |
| parent | 2cdecff4d7fab760e5cca2f4f6c877c16bd7ab76 (diff) | |
| download | rails-741316dc7123e8cdd750642dff6f39257d0ddbec.tar.gz rails-741316dc7123e8cdd750642dff6f39257d0ddbec.tar.bz2 rails-741316dc7123e8cdd750642dff6f39257d0ddbec.zip | |
Fixed construction of get parameters for arrays
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1857 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/routing.rb')
| -rw-r--r-- | actionpack/lib/action_controller/routing.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index 82b12f3a7b..8356b8ce55 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -397,13 +397,7 @@ module ActionController merged = recall.merge(options) expire_on = Routing.expiry_hash(options, recall) - path, keys = generate_path(merged, options, expire_on) - - # Factor out? - extras = {} - k = nil - keys.each {|k| extras[k] = options[k]} - [path, extras] + generate_path(merged, options, expire_on) end def generate_path(merged, options, expire_on) @@ -590,7 +584,7 @@ module ActionController end def extra_keys(options, recall = {}) - generate(options.dup, recall).last.keys + generate(options.dup, recall).last end end |