diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-09-18 11:26:15 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-09-18 11:26:15 -0700 |
commit | 73396238e7218d3697884234fce74e604450bf4f (patch) | |
tree | ae6e7e6da3af94c211625022d09391149396b719 /actionpack/lib/action_dispatch/middleware | |
parent | 93a391e7863102a77991fc019bb5b9b4158ec759 (diff) | |
download | rails-73396238e7218d3697884234fce74e604450bf4f.tar.gz rails-73396238e7218d3697884234fce74e604450bf4f.tar.bz2 rails-73396238e7218d3697884234fce74e604450bf4f.zip |
pull `normalize_encode_params` up
`normalize_encode_params` is common to all parser code paths, so we can
pull that up and always apply it before assigning the request parameters
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware')
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/params_parser.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb index a658a414a5..17524129d4 100644 --- a/actionpack/lib/action_dispatch/middleware/params_parser.rb +++ b/actionpack/lib/action_dispatch/middleware/params_parser.rb @@ -21,8 +21,7 @@ module ActionDispatch DEFAULT_PARSERS = { Mime::JSON => lambda { |raw_post| data = ActiveSupport::JSON.decode(raw_post) - data = {:_json => data} unless data.is_a?(Hash) - Request::Utils.normalize_encode_params(data) + data.is_a?(Hash) ? data : {:_json => data} } } |