From 38eaa636bcca8fcc6bf6cbc9cf90ea986a8374b6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 9 Oct 2019 11:25:37 +0200
Subject: [PATCH] Always use the latest timestamp for merged activities
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 lib/private/Activity/EventMerger.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/private/Activity/EventMerger.php b/lib/private/Activity/EventMerger.php
index ed062d094e5..6b4846164ed 100644
--- 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;
 		}
-- 
2.39.5