summaryrefslogtreecommitdiffstats
path: root/lib/private/Server.php
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2016-11-25 15:21:16 +0100
committerJoas Schilling <coding@schilljs.com>2016-11-25 15:36:11 +0100
commitda9468522b9e846d10b6e91ad10fa0c1b3b99546 (patch)
tree363cc86558aef303a02ffcf539171847c01a6a62 /lib/private/Server.php
parent5ba2b1c193e36cc3f5d029cf80fb267b5ab6cfa3 (diff)
downloadnextcloud-server-da9468522b9e846d10b6e91ad10fa0c1b3b99546.tar.gz
nextcloud-server-da9468522b9e846d10b6e91ad10fa0c1b3b99546.zip
Add an event merger and use it for the files activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private/Server.php')
-rw-r--r--lib/private/Server.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php
index 1d3d588e9fc..797b7a4b823 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -401,6 +401,11 @@ class Server extends ServerContainer implements IServerContainer {
$c->query(IValidator::class)
);
});
+ $this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
+ return new \OC\Activity\EventMerger(
+ $c->getL10N('lib')
+ );
+ });
$this->registerAlias(IValidator::class, Validator::class);
$this->registerService('AvatarManager', function (Server $c) {
return new AvatarManager(