diff options
| author | Joas Schilling <coding@schilljs.com> | 2020-03-10 09:32:10 +0100 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2020-03-10 09:32:52 +0100 |
| commit | 38292753ac571c48cd48c779ee26b35097a45fee (patch) | |
| tree | 8873cdfec89aa3cf9f6b53aca58dd448eb66e367 /apps/files/lib | |
| parent | 5a8c7854d622b0e99a7c877aaf06807161039db2 (diff) | |
| download | nextcloud-server-38292753ac571c48cd48c779ee26b35097a45fee.tar.gz nextcloud-server-38292753ac571c48cd48c779ee26b35097a45fee.zip | |
Combine move activities as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps/files/lib')
| -rw-r--r-- | apps/files/lib/Activity/Provider.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php index 86f5e71b580..07bc471281c 100644 --- a/apps/files/lib/Activity/Provider.php +++ b/apps/files/lib/Activity/Provider.php @@ -246,7 +246,11 @@ class Provider implements IProvider { $this->setSubjects($event, $subject, $parsedParameters); - $event = $this->eventMerger->mergeEvents('file', $event, $previousEvent); + if ($event->getSubject() === 'moved_self' || $event->getSubject() === 'moved_by') { + $event = $this->eventMerger->mergeEvents('oldfile', $event, $previousEvent); + } else { + $event = $this->eventMerger->mergeEvents('file', $event, $previousEvent); + } if ($event->getChildEvent() === null) { // Couldn't group by file, maybe we can group by user |