diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-08-06 00:01:56 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-08-13 10:45:25 +0200 |
| commit | 1d219cf799b82babd0d31825e8d6fa03a20bf581 (patch) | |
| tree | b4f184f0156f34e481e065ee947f4643ad941067 /lib/private/api.php | |
| parent | 55dc74bba48704cc2478530300aece9396b7b191 (diff) | |
| download | nextcloud-server-1d219cf799b82babd0d31825e8d6fa03a20bf581.tar.gz nextcloud-server-1d219cf799b82babd0d31825e8d6fa03a20bf581.zip | |
With V2 we should ensure that the status codes are kept in sync
Diffstat (limited to 'lib/private/api.php')
| -rw-r--r-- | lib/private/api.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/private/api.php b/lib/private/api.php index fb2110471b2..3c599de25a9 100644 --- a/lib/private/api.php +++ b/lib/private/api.php @@ -354,15 +354,18 @@ class OC_API { header($name . ': ' . $value); } + $meta = $result->getMeta(); + $data = $result->getData(); if (self::isV2()) { $statusCode = self::mapStatusCodes($result->getStatusCode()); if (!is_null($statusCode)) { + $meta['statuscode'] = $statusCode; OC_Response::setStatus($statusCode); } } self::setContentType($format); - $body = self::renderResult($result, $format); + $body = self::renderResult($format, $meta, $data); echo $body; } @@ -452,15 +455,14 @@ class OC_API { } /** - * @param OC_OCS_Result $result * @param string $format * @return string */ - public static function renderResult($result, $format) { + public static function renderResult($format, $meta, $data) { $response = array( 'ocs' => array( - 'meta' => $result->getMeta(), - 'data' => $result->getData(), + 'meta' => $meta, + 'data' => $data, ), ); if ($format == 'json') { |