summaryrefslogtreecommitdiffstats
path: root/lib/private/AppFramework
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/AppFramework
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/AppFramework')
-rw-r--r--lib/private/AppFramework/DependencyInjection/DIContainer.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index 48c9b6f4589..148a15172ac 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -98,6 +98,9 @@ class DIContainer extends SimpleContainer implements IAppContainer {
$this->registerService('OCP\\Activity\\IManager', function($c) {
return $this->getServer()->getActivityManager();
});
+ $this->registerService(\OCP\Activity\IEventMerger::class, function($c) {
+ return $this->getServer()->query(\OCP\Activity\IEventMerger::class);
+ });
$this->registerService('OCP\\ICache', function($c) {
return $this->getServer()->getCache();