upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

Merge pull request #19871 from nextcloud/bugfix/14469/combine-move-activities

Browse source 
Combine move activities as well
This commit is contained in:
Roeland Jago Douma 2020-03-10 10:36:17 +01:00 committed by GitHub
commit 812f16880b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/files/lib/Activity/Provider.php
View file

@ -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