diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2015-03-21 20:03:56 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2015-08-10 10:45:08 +0200 |
| commit | 7e6a2b71fd80fedabc64d10bee5ba0edc0b19cf0 (patch) | |
| tree | 885ca90351d6b7fd94bf7e843f3cb15d62378c49 /lib/private/ocs | |
| parent | 214729a5524e2c406415985717c174bedc810954 (diff) | |
| download | nextcloud-server-7e6a2b71fd80fedabc64d10bee5ba0edc0b19cf0.tar.gz nextcloud-server-7e6a2b71fd80fedabc64d10bee5ba0edc0b19cf0.zip | |
Added Capabilities Manager
* This should allow the capabilities to be intergrated into the
appframework
* Unit tests
* Throw exception if closure does not return ICapability instance
Diffstat (limited to 'lib/private/ocs')
| -rw-r--r-- | lib/private/ocs/cloud.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/ocs/cloud.php b/lib/private/ocs/cloud.php index f662bde2858..ff6b7977cd9 100644 --- a/lib/private/ocs/cloud.php +++ b/lib/private/ocs/cloud.php @@ -3,6 +3,7 @@ * @author Bart Visscher <bartv@thisnet.nl> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin McCorkell <rmccorkell@karoshi.org.uk> + * @author Roeland Jago Douma <roeland@famdouma.nl> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Tom Needham <tom@owncloud.com> * @@ -40,8 +41,11 @@ class OC_OCS_Cloud { 'core' => array( 'pollinterval' => OC_Config::getValue('pollinterval', 60), ), - ); - + ); + + + $result['capabilities'] = array_merge_recursive($result['capabilities'], \OC::$server->getCapabilitiesManager()->getCapabilities()); + return new OC_OCS_Result($result); } |