diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-01-23 13:57:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-23 13:57:29 +0300 |
| commit | f40a2bfdf4aa7b8be65cbab94cdaf1dedf0deb50 (patch) | |
| tree | d05be7b0fcca54baab277dddbfa366c4a4b69a0c /lib | |
| parent | 34d1600736b16f9d6976b5021945b0f76cd18b04 (diff) | |
| parent | a0f4a82e511f3ebbb9c234eaaa74c8ca3126e8cd (diff) | |
Merge pull request #19015 from nextcloud/backport/17484/stable16
[stable16] Always use the latest timestamp for merged activities
Diffstat (limited to 'lib')
| -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; } |