From: Julius Härtl <jus@bitgrid.net>
Date: Wed, 9 Oct 2019 09:25:37 +0000 (+0200)
Subject: Always use the latest timestamp for merged activities
X-Git-Tag: v17.0.3RC1~4^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F19014%2Fhead;p=nextcloud-server.git

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 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;
 		}