kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
David Heinemeier Hansson 2005-04-02 08:35:04 +00:00
parent 00121b2ca2
commit 5d42774b62
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/CHANGELOG
View File

@ -1,5 +1,7 @@
*SVN*
* Fixed :overwrite_param so it doesn't delete but reject elements from @request.parameters #982 [raphinou@yahoo.com]
* Added :method option to verify for ensuring that either GET, POST, etc is allowed #984 [Jamis Buck]
* Added options to set cc, bcc, subject, and body for UrlHelper#mail_to #966 [DeLynn]

2
actionpack/lib/action_controller/url_rewriter.rb
View File

@ -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)