diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2007-01-28 05:29:32 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2007-01-28 05:29:32 +0000 |
| commit | 35ec1c928f100f5b75bd2e6af63d26b10ba2282c (patch) | |
| tree | aa90459fb1ca9b4b0ac245a2f65cef1035758be0 /actionpack/lib/action_controller/url_rewriter.rb | |
| parent | c7f50e9a88c381cc274025c766e2edd1dff34d00 (diff) | |
| download | rails-35ec1c928f100f5b75bd2e6af63d26b10ba2282c.tar.gz rails-35ec1c928f100f5b75bd2e6af63d26b10ba2282c.tar.bz2 rails-35ec1c928f100f5b75bd2e6af63d26b10ba2282c.zip | |
Fix doubly appearing parameters due to string and symbol mixups. Closes #2551.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6053 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/url_rewriter.rb')
| -rw-r--r-- | actionpack/lib/action_controller/url_rewriter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/url_rewriter.rb b/actionpack/lib/action_controller/url_rewriter.rb index 0a5aab14d1..71f87ad373 100644 --- a/actionpack/lib/action_controller/url_rewriter.rb +++ b/actionpack/lib/action_controller/url_rewriter.rb @@ -96,7 +96,7 @@ module ActionController options.update(options[:params].symbolize_keys) if options[:params] if (overwrite = options.delete(:overwrite_params)) options.update(@parameters.symbolize_keys) - options.update(overwrite) + options.update(overwrite.symbolize_keys) end RESERVED_OPTIONS.each {|k| options.delete k} |