diff options
author | Zach Copley <zach@status.net> | 2010-10-05 17:09:57 -0700 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2010-10-06 13:40:01 -0700 |
commit | 4247be51164706af31b2d2a55807a05d89d31fb1 (patch) | |
tree | b195503447550ba0da70c5fc77b8f6998b3a8708 | |
parent | 83566f014c378bd1b6ebad936e98e4e76b3b731b (diff) |
Add plain text error format to clientError()
-rw-r--r-- | lib/apiaction.php | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/apiaction.php b/lib/apiaction.php index 0ebf88282..afba8ab63 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -1244,23 +1244,29 @@ class ApiAction extends Action // Do not emit error header for JSONP if (!isset($this->callback)) { - header('HTTP/1.1 '.$code.' '.$status_string); + header('HTTP/1.1 ' . $code . ' ' . $status_string); } - if ($format == 'xml') { + switch($format) { + case 'xml': $this->initDocument('xml'); $this->elementStart('hash'); $this->element('error', null, $msg); $this->element('request', null, $_SERVER['REQUEST_URI']); $this->elementEnd('hash'); $this->endDocument('xml'); - } elseif ($format == 'json'){ + break; + case 'json': $this->initDocument('json'); $error_array = array('error' => $msg, 'request' => $_SERVER['REQUEST_URI']); print(json_encode($error_array)); $this->endDocument('json'); - } else { - + break; + case 'text': + header('Content-Type: text/plain; charset=utf-8'); + print $msg; + break; + default: // If user didn't request a useful format, throw a regular client error throw new ClientException($msg, $code); } |