JSON output, handle Accept header

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index ca09e580751b3752e1922ea65712a2b63efe9b57..7599568af225e2d35e1f16cd3fa58e531353cb6d 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -5,7 +5,9 @@ class ApiController < ApplicationController
 
   # Set format to xml unless client requires a specific format
   def default_format_xml
 
   # Set format to xml unless client requires a specific format
   def default_format_xml

-    request.format = "xml" unless params[:format]
+    unless params[:format]
+      request.format = "xml" unless request.format.symbol == :json
+    end

   end
 
   def authorize(realm = "Web Password", errormessage = "Couldn't authenticate you")
   end
 
   def authorize(realm = "Web Password", errormessage = "Couldn't authenticate you")