Merge pull request #19014 from nextcloud/backport/17484/stable17

rullzer · web-flow · commit cd7dad8ff8d3 · 2020-01-22T08:00:51.000+01:00
[stable17] Always use the latest timestamp for merged activities
diff --git a/lib/private/Activity/EventMerger.php b/lib/private/Activity/EventMerger.php
@@ -111,7 +111,8 @@ public function mergeEvents($mergeParameter, IEvent $event, IEvent $previousEven
 
 			$event->setRichSubject($newSubject, $parameters)
 				->setParsedSubject($parsedSubject)
-				->setChildEvent($previousEvent);
+				->setChildEvent($previousEvent)
+				->setTimestamp(max($event->getTimestamp(), $previousEvent->getTimestamp()));
 		} catch (\UnexpectedValueException $e) {
 			return $event;
 		}

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,8 @@ public function mergeEvents($mergeParameter, IEvent $event, IEvent $previousEven`
`111`	`111`
`112`	`112`	`$event->setRichSubject($newSubject, $parameters)`
`113`	`113`	`->setParsedSubject($parsedSubject)`
`114`		`- ->setChildEvent($previousEvent);`
	`114`	`+ ->setChildEvent($previousEvent)`
	`115`	`+ ->setTimestamp(max($event->getTimestamp(), $previousEvent->getTimestamp()));`
`115`	`116`	`} catch (\UnexpectedValueException $e) {`
`116`	`117`	`return $event;`
`117`	`118`	`}`