diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-06-30 15:37:38 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-06-30 15:37:38 +0200 |
| commit | 972fffbe02d1e0493d498859b76de698ecf5d067 (patch) | |
| tree | fbf15344e9bc77d23e5dacca36fa48632f80f507 | |
| parent | 2e45eb8ad69d8978220e0b3ea4314545cb08fa6f (diff) | |
| download | nextcloud-server-972fffbe02d1e0493d498859b76de698ecf5d067.tar.gz nextcloud-server-972fffbe02d1e0493d498859b76de698ecf5d067.zip | |
Return 503 OCS response with requested format
| -rw-r--r-- | lib/private/api.php | 2 | ||||
| -rw-r--r-- | ocs/v1.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/api.php b/lib/private/api.php index 74887690952..e9c144564f0 100644 --- a/lib/private/api.php +++ b/lib/private/api.php @@ -301,7 +301,7 @@ class OC_API { * @param OC_OCS_Result $result * @param string $format the format xml|json */ - private static function respond($result, $format='xml') { + public static function respond($result, $format='xml') { // Send 401 headers if unauthorised if($result->getStatusCode() === self::RESPOND_UNAUTHORISED) { header('WWW-Authenticate: Basic realm="Authorisation Required"'); diff --git a/ocs/v1.php b/ocs/v1.php index 624355a8501..0a86fb06411 100644 --- a/ocs/v1.php +++ b/ocs/v1.php @@ -27,7 +27,8 @@ if (\OCP\Util::needUpgrade()) { // since the behavior of apps or remotes are unpredictable during // an upgrade, return a 503 directly OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE); - OC_Template::printErrorPage('Service unavailable'); + $response = new OC_OCS_Result(null, OC_Response::STATUS_SERVICE_UNAVAILABLE, 'Service unavailable'); + OC_API::respond($response, OC_API::requestedFormat()); exit; } |