Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

[quix0rs-gnu-social.git] / lib / api.php

diff --git a/lib/api.php b/lib/api.php
index 5758cc87455ae71d597f766b74875a00554df616..7a99f48e8055cdbafcb1813f1afac1a293e027da 100644 (file)
--- a/lib/api.php
+++ b/lib/api.php
@@ -1104,7 +1104,7 @@ class ApiAction extends Action
         }
     }
 
-    function serverError($msg, $code = 500, $content_type = 'json')
+    function serverError($msg, $code = 500, $content_type = 'xml')
     {
         $action = $this->trimmed('action');