aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/params_wrapper.rb
diff options
context:
space:
mode:
authorDmitry Vorotilin <d.vorotilin@gmail.com>2012-04-29 19:16:32 +0400
committerDmitry Vorotilin <d.vorotilin@gmail.com>2012-05-20 09:33:56 +0400
commit32a433e1c04264b891a4b4793ac0c75f0acaf9df (patch)
treef76eb7199aecc4bdca288a42c938d896bce3d11b /actionpack/lib/action_controller/metal/params_wrapper.rb
parentda97cf016a8ffd1f54f804cd881f393e5d6efc18 (diff)
downloadrails-32a433e1c04264b891a4b4793ac0c75f0acaf9df.tar.gz
rails-32a433e1c04264b891a4b4793ac0c75f0acaf9df.tar.bz2
rails-32a433e1c04264b891a4b4793ac0c75f0acaf9df.zip
Show in log correct wrapped keys
Diffstat (limited to 'actionpack/lib/action_controller/metal/params_wrapper.rb')
-rw-r--r--actionpack/lib/action_controller/metal/params_wrapper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
index 1f52c164de..aa67fa7f23 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -193,7 +193,8 @@ module ActionController
def process_action(*args)
if _wrapper_enabled?
wrapped_hash = _wrap_parameters request.request_parameters
- wrapped_filtered_hash = _wrap_parameters request.filtered_parameters
+ wrapped_keys = request.request_parameters.keys
+ wrapped_filtered_hash = _wrap_parameters request.filtered_parameters.slice(*wrapped_keys)
# This will make the wrapped hash accessible from controller and view
request.parameters.merge! wrapped_hash