From 7e6a2b71fd80fedabc64d10bee5ba0edc0b19cf0 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Sat, 21 Mar 2015 20:03:56 +0100
Subject: 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
---
 lib/private/ocs/cloud.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib/private/ocs')

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);
 	}
 	
-- 
cgit v1.2.3