From 7977454456fd65b31859089a14bfca0d4a453138 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 1 Feb 2011 14:35:42 -0800 Subject: [PATCH] Ticket #3022: fix formatting output for ApiAction::clientError and ApiAction::serverError when caller doesn't explicitly pass the format. Format's already available as a member variable, so use it! Fixes some error reponses in api/statusnet/groups/leave.json which were coming through as XML. May fix some others as well. --- lib/apiaction.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/apiaction.php b/lib/apiaction.php index dcce18ef27..6caf468bf2 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -1236,9 +1236,12 @@ class ApiAction extends Action return; } - function clientError($msg, $code = 400, $format = 'xml') + function clientError($msg, $code = 400, $format = null) { $action = $this->trimmed('action'); + if ($format === null) { + $format = $this->format; + } 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'); + if ($content_type === null) { + $content_type = $this->format; + } common_debug("Server error '$code' on '$action': $msg", __FILE__); -- 2.39.5