diff options
| author | Joas Schilling <coding@schilljs.com> | 2016-11-08 14:09:41 +0100 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2016-11-16 09:25:45 +0100 |
| commit | 27c08167df6b5350ef0901ccaa8c7f40aa288c5e (patch) | |
| tree | 3bcb9b11e422870e5ddc4067c73943785c9c7255 /apps/files | |
| parent | c2a5c1f2c6a254143eced58733ace517aa35ddae (diff) | |
| download | nextcloud-server-27c08167df6b5350ef0901ccaa8c7f40aa288c5e.tar.gz nextcloud-server-27c08167df6b5350ef0901ccaa8c7f40aa288c5e.zip | |
Don't even try to combine when the subject is different
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/lib/Activity/Provider.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php index ee7030ce546..5b2c07f294b 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) |