diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-05-24 20:42:03 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-05-24 20:42:03 +0000 |
| commit | b290bc6b2f3ddefdfecd58d60bfa2517612dbad4 (patch) | |
| tree | 5878f27d9d416658de66b06725291a2a2344b91b | |
| parent | 04354cd4c278cffd4da6a5cf31f403aeb099d436 (diff) | |
| download | rails-b290bc6b2f3ddefdfecd58d60bfa2517612dbad4.tar.gz rails-b290bc6b2f3ddefdfecd58d60bfa2517612dbad4.tar.bz2 rails-b290bc6b2f3ddefdfecd58d60bfa2517612dbad4.zip | |
Don't alias local var
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6829 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rwxr-xr-x | actionpack/lib/action_controller/request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |