summaryrefslogtreecommitdiffstats
path: root/core/Controller
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2016-08-10 22:36:25 +0200
committerGitHub <noreply@github.com>2016-08-10 22:36:25 +0200
commitba922c9f73c8b61998686d2273fbaccc7f88ed97 (patch)
treebb9b6985d64358b68ea5168e7a12b6dd08d58a9c /core/Controller
parent67d016833d637982a197bb848836c7afcea88358 (diff)
parent9544c97ffe888a16cdf58013b5a97056771eb856 (diff)
downloadnextcloud-server-ba922c9f73c8b61998686d2273fbaccc7f88ed97.tar.gz
nextcloud-server-ba922c9f73c8b61998686d2273fbaccc7f88ed97.zip
Merge pull request #807 from nextcloud/ocs_dataresponse
OCSController requires DataResponse
Diffstat (limited to 'core/Controller')
-rw-r--r--core/Controller/OCSController.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php
index d5783ae32e9..8eee52096c2 100644
--- a/core/Controller/OCSController.php
+++ b/core/Controller/OCSController.php
@@ -69,7 +69,7 @@ class OCSController extends \OCP\AppFramework\OCSController {
$result['capabilities'] = $this->capabilitiesManager->getCapabilities();
- return new DataResponse(['data' => $result]);
+ return new DataResponse($result);
}
/**
@@ -83,6 +83,6 @@ class OCSController extends \OCP\AppFramework\OCSController {
'display-name' => $userObject->getDisplayName(),
'email' => $userObject->getEMailAddress(),
];
- return new DataResponse(['data' => $data]);
+ return new DataResponse($data);
}
}