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

Always use the latest timestamp for merged activities 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2019-10-09 11:25:37 +02:00 committed by Backportbot
parent e2a54118df
commit a0f4a82e51
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;
}