diff options
| author | Julius Härtl <jus@bitgrid.net> | 2019-10-09 11:25:37 +0200 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2019-10-09 11:25:37 +0200 |
| commit | a41ed39bf2bd297a1c42b6d531e7526fb2d23bc1 (patch) | |
| tree | 9be8ff85e63604234657f8d3b407d1aa287e268a /lib/private/Activity | |
| parent | 049628a3f53f3e5e6fe4111b5e28fa90d1a95dd9 (diff) | |
| download | nextcloud-server-a41ed39bf2bd297a1c42b6d531e7526fb2d23bc1.tar.gz nextcloud-server-a41ed39bf2bd297a1c42b6d531e7526fb2d23bc1.zip | |
Always use the latest timestamp for merged activities
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib/private/Activity')
| -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; } |