eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brion Vibber
2010-02-12 15:32:12 -08:00
parent 122c8677b7 d6f1df8b76
commit f8a459a88a
6 changed files with 152 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/api.php
View File

@@ -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');