aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorSzymon Nowak <szimek@gmail.com>2012-08-24 21:55:41 +0200
committerSzymon Nowak <szimek@gmail.com>2012-08-24 21:55:41 +0200
commitb6ba012032c0c53e4539228b06f3da6d6a5a69bc (patch)
treec6f76429583ebf514ae768b815d62cf796329996 /actionpack/lib
parentd14e2e5a217c5dfbc0de1796f2821ea1efd07fe4 (diff)
downloadrails-b6ba012032c0c53e4539228b06f3da6d6a5a69bc.tar.gz
rails-b6ba012032c0c53e4539228b06f3da6d6a5a69bc.tar.bz2
rails-b6ba012032c0c53e4539228b06f3da6d6a5a69bc.zip
Fix ActionDispatch::ParamsParser::ParseError message for XML and JSON parsers.
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/middleware/params_parser.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb
index 7f38c6d4f3..46e33484a4 100644
--- a/actionpack/lib/action_dispatch/middleware/params_parser.rb
+++ b/actionpack/lib/action_dispatch/middleware/params_parser.rb
@@ -40,14 +40,12 @@ module ActionDispatch
when Proc
strategy.call(request.raw_post)
when :xml_simple, :xml_node
- data = Hash.from_xml(request.body.read) || {}
- request.body.rewind if request.body.respond_to?(:rewind)
+ data = Hash.from_xml(request.raw_post) || {}
data.with_indifferent_access
when :yaml
YAML.load(request.raw_post)
when :json
- data = ActiveSupport::JSON.decode(request.body)
- request.body.rewind if request.body.respond_to?(:rewind)
+ data = ActiveSupport::JSON.decode(request.raw_post)
data = {:_json => data} unless data.is_a?(Hash)
data.with_indifferent_access
else