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

Merge branch '3022' into testing

This commit is contained in:
Brion Vibber 2011-02-01 14:37:46 -08:00
parent b595c3f0d5 7977454456
commit ec93184d7b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/apiaction.php
View File

@ -1236,9 +1236,12 @@ class ApiAction extends Action
return; return;
} }
function clientError($msg, $code = 400, $format = 'xml') function clientError($msg, $code = 400, $format = null)
{ {
$action = $this->trimmed('action'); $action = $this->trimmed('action');
if ($format === null) {
$format = $this->format;
}
common_debug("User error '$code' on '$action': $msg", __FILE__); common_debug("User error '$code' on '$action': $msg", __FILE__);
@ -1278,9 +1281,12 @@ class ApiAction extends Action
} }
} }
function serverError($msg, $code = 500, $content_type = 'xml') function serverError($msg, $code = 500, $content_type = null)
{ {
$action = $this->trimmed('action'); $action = $this->trimmed('action');
if ($content_type === null) {
$content_type = $this->format;
}
common_debug("Server error '$code' on '$action': $msg", __FILE__); common_debug("Server error '$code' on '$action': $msg", __FILE__);