diff options
| author | Rick Olson <technoweenie@gmail.com> | 2008-04-08 05:05:54 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2008-04-08 05:05:54 +0000 |
| commit | 4d594cffcfc93b37fad4e423ec8593299e50133c (patch) | |
| tree | 59643ee7a1eec4e3208f81f6e344a66207f648ec /actionpack/lib/action_controller/base.rb | |
| parent | 0ff7a2d89fc95dcb0a32ed92aab7156b0778a7ea (diff) | |
| download | rails-4d594cffcfc93b37fad4e423ec8593299e50133c.tar.gz rails-4d594cffcfc93b37fad4e423ec8593299e50133c.tar.bz2 rails-4d594cffcfc93b37fad4e423ec8593299e50133c.zip | |
Automatically parse posted JSON content for Mime::JSON requests. [rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9242 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index d7e4116581..7c838ba769 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -316,9 +316,10 @@ module ActionController #:nodoc: # A YAML parser is also available and can be turned on with: # # ActionController::Base.param_parsers[Mime::YAML] = :yaml - @@param_parsers = { Mime::MULTIPART_FORM => :multipart_form, + @@param_parsers = { Mime::MULTIPART_FORM => :multipart_form, Mime::URL_ENCODED_FORM => :url_encoded_form, - Mime::XML => :xml_simple } + Mime::XML => :xml_simple, + Mime::JSON => :json } cattr_accessor :param_parsers # Controls the default charset for all renders. |