summaryrefslogtreecommitdiffstats
path: root/lib/private/server.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/server.php')
-rw-r--r--lib/private/server.php24
1 files changed, 21 insertions, 3 deletions
diff --git a/lib/private/server.php b/lib/private/server.php
index 661aaf6786d..6df7722973e 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -228,8 +228,12 @@ class Server extends SimpleContainer implements IServerContainer {
new ArrayCache()
);
});
- $this->registerService('ActivityManager', function ($c) {
- return new ActivityManager();
+ $this->registerService('ActivityManager', function (Server $c) {
+ return new ActivityManager(
+ $c->getRequest(),
+ $c->getUserSession(),
+ $c->getConfig()
+ );
});
$this->registerService('AvatarManager', function ($c) {
return new AvatarManager();
@@ -396,6 +400,13 @@ class Server extends SimpleContainer implements IServerContainer {
new \OC_Defaults()
);
});
+ $this->registerService('OcsClient', function(Server $c) {
+ return new OCSClient(
+ $this->getHTTPClientService(),
+ $this->getConfig(),
+ $this->getLogger()
+ );
+ });
}
/**
@@ -435,7 +446,7 @@ class Server extends SimpleContainer implements IServerContainer {
* currently being processed is returned from this method.
* In case the current execution was not initiated by a web request null is returned
*
- * @return \OCP\IRequest|null
+ * @return \OCP\IRequest
*/
function getRequest() {
return $this->query('Request');
@@ -837,6 +848,13 @@ class Server extends SimpleContainer implements IServerContainer {
}
/**
+ * @return \OC\OCSClient
+ */
+ public function getOcsClient() {
+ return $this->query('OcsClient');
+ }
+
+ /**
* @return \OCP\IDateTimeZone
*/
public function getDateTimeZone() {