diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-10-10 20:30:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-10 20:30:16 +0200 |
| commit | 1e8f063aed85072b16aafbe08f5c4d98c8273b1a (patch) | |
| tree | af75b3ca21b9c94eeb1711b75463abfc0e21ff93 /lib | |
| parent | 0e06239ae144227598def41a1c4482d6b12385a6 (diff) | |
| parent | a41ed39bf2bd297a1c42b6d531e7526fb2d23bc1 (diff) | |
| download | nextcloud-server-1e8f063aed85072b16aafbe08f5c4d98c8273b1a.tar.gz nextcloud-server-1e8f063aed85072b16aafbe08f5c4d98c8273b1a.zip | |
Merge pull request #17484 from nextcloud/bugfix/activity-last-timestamp-merged
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; } |