aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-04-02 08:35:04 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-04-02 08:35:04 +0000
commit5d42774b6253dabeb8238651422a113be1bfe083 (patch)
treeeb50fdcfe4c06edac8c4c9b4371c89a98f136734 /actionpack/lib/action_controller
parent00121b2ca2f795d16b54295cb9fc0fdcbbe50dd8 (diff)
downloadrails-5d42774b6253dabeb8238651422a113be1bfe083.tar.gz
rails-5d42774b6253dabeb8238651422a113be1bfe083.tar.bz2
rails-5d42774b6253dabeb8238651422a113be1bfe083.zip
Fixed :overwrite_param so it doesn't delete but reject elements from @request.parameters #982 [raphinou@yahoo.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1061 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/url_rewriter.rb2
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 6d7c99eff0..e79ac4daa1 100644
--- a/actionpack/lib/action_controller/url_rewriter.rb
+++ b/actionpack/lib/action_controller/url_rewriter.rb
@@ -38,7 +38,7 @@ module ActionController
path, extras = Routing::Routes.generate(options, @request)
if extras[:overwrite_params]
- params_copy = @request.parameters.delete_if { |k,v| ["controller","action"].include? k }
+ params_copy = @request.parameters.reject { |k,v| ["controller","action"].include? k }
params_copy.update extras[:overwrite_params]
extras.delete(:overwrite_params)
extras.update(params_copy)