diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-12 15:32:12 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-12 15:32:12 -0800 |
| commit | f8a459a88adbdfc07b3fbf40c73dacc5b39ddbd9 (patch) | |
| tree | 17aca874063515cffca802a0d411cc4ba98d2aae /lib/api.php | |
| parent | 122c8677b7004bae4cfe7e2bd49fc1bc3187c72c (diff) | |
| parent | d6f1df8b76259acfc0d0566e8bf3610172b27884 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/api.php')
| -rw-r--r-- | lib/api.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api.php b/lib/api.php index 5758cc874..7a99f48e8 100644 --- 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'); |