Mime types are separated by a comma, not semicolon, in the Accept header. Also switch all internal configuration of mime types away from strings and over to Mime::Type [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3847 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 4 insertions, 4 deletions

diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index c6c052ec56..4663828c96 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -271,7 +271,7 @@ module ActionController #:nodoc:
     # 
     # Example of doing your own parser for a custom content type:
     #
-    #   ActionController::Base.param_parsers['application/atom+xml'] = Proc.new do |data| 
+    #   ActionController::Base.param_parsers[Mime::Type.lookup('application/atom+xml')] = Proc.new do |data| 
     #      node = REXML::Document.new(post) 
     #     { node.root.name => node.root }
     #   end
@@ -281,10 +281,10 @@ module ActionController #:nodoc:
     # in params[:r][:name] for "David" instead of params[:name]. To get the old behavior, you can 
     # re-register XmlSimple as application/xml handler and enable application/x-yaml like this:
     #
-    #   ActionController::Base.param_parsers['application/xml']    = 
+    #   ActionController::Base.param_parsers[Mime::XML]  = 
     #     Proc.new { |data| XmlSimple.xml_in(data, 'ForceArray' => false) }
-    #   ActionController::Base.param_parsers['application/x-yaml'] = :yaml
-    @@param_parsers = { 'application/xml' => :xml_simple }
+    #   ActionController::Base.param_parsers[Mime::YAML] = :yaml
+    @@param_parsers = { Mime::XML => :xml_simple }
     cattr_accessor :param_parsers 
 
     # Template root determines the base from which template references will be made. So a call to render("test/template")