diff options
| author | MichaIng <micha@dietpi.com> | 2019-12-04 12:42:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-04 12:42:55 +0100 |
| commit | 4384806f616cf7b9f6a4492ba2fd094afd064f86 (patch) | |
| tree | c653df3fcea2c8fce6101d066e0bf42db8026d6e /lib/private/Activity | |
| parent | 5afd7abf4481f019ad0044393b4734645e40f5af (diff) | |
| parent | 76b78edd40fcb5dbe7f0434cbc41d2e291acfec1 (diff) | |
| download | nextcloud-server-4384806f616cf7b9f6a4492ba2fd094afd064f86.tar.gz nextcloud-server-4384806f616cf7b9f6a4492ba2fd094afd064f86.zip | |
Merge branch 'master' into patch-1
Diffstat (limited to 'lib/private/Activity')
| -rw-r--r-- | lib/private/Activity/EventMerger.php | 3 | ||||
| -rw-r--r-- | lib/private/Activity/Manager.php | 1 |
2 files changed, 3 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; } diff --git a/lib/private/Activity/Manager.php b/lib/private/Activity/Manager.php index ba2d1147bc8..29c3c7bbc4d 100644 --- a/lib/private/Activity/Manager.php +++ b/lib/private/Activity/Manager.php @@ -23,6 +23,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ + namespace OC\Activity; |