sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17484 from nextcloud/bugfix/activity-last-timestamp-merged 

Always use the latest timestamp for merged activities
pull/17510/head
Roeland Jago Douma 2019-10-10 20:30:16 +07:00 committed by GitHub
parent 0e06239ae1 a41ed39bf2
commit 1e8f063aed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/private/Activity/EventMerger.php
Unescape Escape View File

@ -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;
}