aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
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-07-05 15:47:04 +0400
commitffdca21e4489967abcc709333c4835ee45059337 (patch)
tree3605e906a195a588af40b7dd8383be71a1fa8655 /actionpack/lib
parent7faa620fd697fe7323487e893596bc761e8d8b33 (diff)
downloadrails-ffdca21e4489967abcc709333c4835ee45059337.tar.gz
rails-ffdca21e4489967abcc709333c4835ee45059337.tar.bz2
rails-ffdca21e4489967abcc709333c4835ee45059337.zip
Show in log correct wrapped keys
Diffstat (limited to 'actionpack/lib')
-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 1ab436a205..ea71171da2 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -194,7 +194,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