Update bundle

[rails.git] / app / controllers / api_controller.rb

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index c0534a6faef18b4b56abf0d33a6cf66d5423763f..64514a4321f8ff3523621fae28b2830f6f3fa6e5 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -45,6 +45,10 @@ class ApiController < ApplicationController
           request.format = "xml"
           break
         end
+
+        # In case the client requests some other format besides XML, JSON and */*,
+        # we deliberately don't set request.format. The framework will return an
+        # ActionController::UnknownFormat error to the client later on in this case.
       end
     end
   end