diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2013-01-10 22:53:18 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2013-01-10 22:53:18 -0800 |
| commit | 92fada9b8c10b75d88190938ea2fd5a92277697b (patch) | |
| tree | 71445260ff346809533fa27a993995f3f2b6ffd1 /actionpack/lib/action_dispatch/middleware/params_parser.rb | |
| parent | 8a7fad8970aadea3a79657ef09d3247786e27c2e (diff) | |
| parent | bae92681be97191edda90990e08b5275d187107f (diff) | |
| download | rails-92fada9b8c10b75d88190938ea2fd5a92277697b.tar.gz rails-92fada9b8c10b75d88190938ea2fd5a92277697b.tar.bz2 rails-92fada9b8c10b75d88190938ea2fd5a92277697b.zip | |
Merge pull request #8855 from dylanahsmith/parse-non-object-json-params
Fix json params parsing regression for non-object JSON content.
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/params_parser.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/params_parser.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb index a3291bb7ad..0898ad82dd 100644 --- a/actionpack/lib/action_dispatch/middleware/params_parser.rb +++ b/actionpack/lib/action_dispatch/middleware/params_parser.rb @@ -50,9 +50,9 @@ module ActionDispatch data = request.deep_munge(Hash.from_xml(request.body.read) || {}) data.with_indifferent_access when :json - data = request.deep_munge ActiveSupport::JSON.decode(request.body) + data = ActiveSupport::JSON.decode(request.body) data = {:_json => data} unless data.is_a?(Hash) - data.with_indifferent_access + request.deep_munge(data).with_indifferent_access else false end |