From 27c08167df6b5350ef0901ccaa8c7f40aa288c5e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 8 Nov 2016 14:09:41 +0100 Subject: [PATCH] Don't even try to combine when the subject is different Signed-off-by: Joas Schilling --- apps/files/lib/Activity/Provider.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php index ee7030ce54..5b2c07f294 100644 --- a/apps/files/lib/Activity/Provider.php +++ b/apps/files/lib/Activity/Provider.php @@ -59,6 +59,11 @@ class Provider implements IProvider { $parsedParameters = $this->getParsedParameters($event->getSubject(), $event->getSubjectParameters()); $richParameters = $this->getRichParameters($event->getSubject(), $event->getSubjectParameters()); + if ($previousEvent instanceof IEvent && $event->getSubject() !== $previousEvent->getSubject()) { + // Different subject means not the same string, so no grouping + $previousEvent = null; + } + if ($event->getSubject() === 'created_self') { $event->setParsedSubject($this->l->t('You created %1$s', $parsedParameters)) ->setRichSubject($this->l->t('You created {file1}'), $richParameters)