aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/params_wrapper.rb
diff options
context:
space:
mode:
authorJosh Jordan <josh.jordan@gmail.com>2014-01-28 16:51:01 -0500
committerJosh Jordan <josh.jordan@gmail.com>2014-01-30 18:20:55 -0500
commit1f9586fd4725f5e81177cc6adba879b4869f71af (patch)
tree7b6e08de731b6b6e9da09d973cc0e365e8561a5c /actionpack/lib/action_controller/metal/params_wrapper.rb
parentb9cd5a29dd4c6142b19c861fbf1a67452320b3dd (diff)
downloadrails-1f9586fd4725f5e81177cc6adba879b4869f71af.tar.gz
rails-1f9586fd4725f5e81177cc6adba879b4869f71af.tar.bz2
rails-1f9586fd4725f5e81177cc6adba879b4869f71af.zip
Do not discard query parameters on requests that use wrap_parameters
Diffstat (limited to 'actionpack/lib/action_controller/metal/params_wrapper.rb')
-rw-r--r--actionpack/lib/action_controller/metal/params_wrapper.rb15
1 files changed, 11 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
index c9f1d8dcb4..2ca8955741 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -231,7 +231,12 @@ module ActionController
# by the metal call stack.
def process_action(*args)
if _wrapper_enabled?
- wrapped_hash = _wrap_parameters request.request_parameters
+ if request.parameters[_wrapper_key].present?
+ wrapped_hash = _extract_parameters(request.parameters)
+ else
+ wrapped_hash = _wrap_parameters request.request_parameters
+ end
+
wrapped_keys = request.request_parameters.keys
wrapped_filtered_hash = _wrap_parameters request.filtered_parameters.slice(*wrapped_keys)
@@ -259,14 +264,16 @@ module ActionController
# Returns the list of parameters which will be selected for wrapped.
def _wrap_parameters(parameters)
- value = if include_only = _wrapper_options.include
+ { _wrapper_key => _extract_parameters(parameters) }
+ end
+
+ def _extract_parameters(parameters)
+ if include_only = _wrapper_options.include
parameters.slice(*include_only)
else
exclude = _wrapper_options.exclude || []
parameters.except(*(exclude + EXCLUDE_PARAMETERS))
end
-
- { _wrapper_key => value }
end
# Checks if we should perform parameters wrapping.