mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #19015 from nextcloud/backport/17484/stable16 

[stable16] Always use the latest timestamp for merged activities
This commit is contained in:
Roeland Jago Douma 2020-01-23 11:57:29 +01:00 committed by GitHub
parent 34d1600736 a0f4a82e51
commit f40a2bfdf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/private/Activity/EventMerger.php
View File

@ -111,7 +111,8 @@ class EventMerger implements IEventMerger {
$event->setRichSubject($newSubject, $parameters)
->setParsedSubject($parsedSubject)
->setChildEvent($previousEvent);
->setChildEvent($previousEvent)
->setTimestamp(max($event->getTimestamp(), $previousEvent->getTimestamp()));
} catch (\UnexpectedValueException $e) {
return $event;
}