Always use the latest timestamp for merged activities

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/lib/private/Activity/EventMerger.php b/lib/private/Activity/EventMerger.php
index ed062d094e5b2258f800697749d8daf85bd86424..6b4846164ed6ed6e4fec268aeffccd15013571f3 100644 (file)
--- a/lib/private/Activity/EventMerger.php
+++ b/lib/private/Activity/EventMerger.php
@@ -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;
                }