diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2005-09-06 22:06:11 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2005-09-06 22:06:11 +0000 |
| commit | 3108764367023aabaee04d1dbcbed8eb76e61184 (patch) | |
| tree | 544696039d567618de9b58d266e5225c20004dff /actionpack/lib/action_controller | |
| parent | f2a89d7862313505562186620a07d498190971c3 (diff) | |
| download | rails-3108764367023aabaee04d1dbcbed8eb76e61184.tar.gz rails-3108764367023aabaee04d1dbcbed8eb76e61184.tar.bz2 rails-3108764367023aabaee04d1dbcbed8eb76e61184.zip | |
Fix overwrite params. Closes #1909
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2144 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/url_rewriter.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/url_rewriter.rb b/actionpack/lib/action_controller/url_rewriter.rb index 7d66cf1ced..acad0b7b8c 100644 --- a/actionpack/lib/action_controller/url_rewriter.rb +++ b/actionpack/lib/action_controller/url_rewriter.rb @@ -36,6 +36,10 @@ module ActionController def rewrite_path(options) options = options.symbolize_keys options.update(options[:params].symbolize_keys) if options[:params] + if (overwrite = options.delete(:overwrite_params)) + options.update(@parameters) + options.update(overwrite) + end RESERVED_OPTIONS.each {|k| options.delete k} path, extra_keys = Routing::Routes.generate(options.dup, @request) # Warning: Routes will mutate and violate the options hash |