Merge pull request #19015 from nextcloud/backport/17484/stable16
[stable16] Always use the latest timestamp for merged activities
This commit is contained in:
commit
f40a2bfdf4
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue