From b290bc6b2f3ddefdfecd58d60bfa2517612dbad4 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 24 May 2007 20:42:03 +0000 Subject: Don't alias local var git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6829 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/request.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller/request.rb') diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb index cdd35cc17b..caab289acd 100755 --- a/actionpack/lib/action_controller/request.rb +++ b/actionpack/lib/action_controller/request.rb @@ -325,7 +325,7 @@ module ActionController strategy = ActionController::Base.param_parsers[mime_type] # Only multipart form parsing expects a stream. - body = raw_post if strategy && strategy != :multipart_form + body = (strategy && strategy != :multipart_form) ? raw_post : self.body case strategy when Proc -- cgit v1.2.3