diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-03-10 10:36:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-10 10:36:17 +0100 |
| commit | 812f16880b2cf5968a351e2f9928299458ce7b3d (patch) | |
| tree | 566d7b143f268c7ec49b554b306e82a5cbdef146 /apps/files | |
| parent | acbe08cd406412183f5d5a55627404d5f1a3a862 (diff) | |
| parent | 38292753ac571c48cd48c779ee26b35097a45fee (diff) | |
| download | nextcloud-server-812f16880b2cf5968a351e2f9928299458ce7b3d.tar.gz nextcloud-server-812f16880b2cf5968a351e2f9928299458ce7b3d.zip | |
Merge pull request #19871 from nextcloud/bugfix/14469/combine-move-activities
Combine move activities as well
Diffstat (limited to 'apps/files')
| -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 |