diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-01-22 08:00:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 08:00:51 +0100 |
| commit | cd7dad8ff8d374900deab30620944bf3c51faae7 (patch) | |
| tree | 9d02ba452c0a59b5a56dc74e18a52cc1cd89d823 | |
| parent | b5c9d53e3e5586cf0edc7b7d7198cd43f3917999 (diff) | |
| parent | 38eaa636bcca8fcc6bf6cbc9cf90ea986a8374b6 (diff) | |
| download | nextcloud-server-cd7dad8ff8d374900deab30620944bf3c51faae7.tar.gz nextcloud-server-cd7dad8ff8d374900deab30620944bf3c51faae7.zip | |
Merge pull request #19014 from nextcloud/backport/17484/stable17
[stable17] Always use the latest timestamp for merged activities
| -rw-r--r-- | lib/private/Activity/EventMerger.php | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |