diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-03-28 17:19:34 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2017-03-28 17:19:34 +0200 |
| commit | 644b37c7e4226593d8d2d450d6ce9d3a77798885 (patch) | |
| tree | d3cb01baff91d860939e6f30d912a6013de6bfb5 /lib/private/Activity/EventMerger.php | |
| parent | 401a5d896d7b3b6f55d203c647ffae4021ad3343 (diff) | |
| download | nextcloud-server-644b37c7e4226593d8d2d450d6ce9d3a77798885.tar.gz nextcloud-server-644b37c7e4226593d8d2d450d6ce9d3a77798885.zip | |
Change the order on merging activities so the newest item is first
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private/Activity/EventMerger.php')
| -rw-r--r-- | lib/private/Activity/EventMerger.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/Activity/EventMerger.php b/lib/private/Activity/EventMerger.php index 91e79068665..04aa41b2690 100644 --- a/lib/private/Activity/EventMerger.php +++ b/lib/private/Activity/EventMerger.php @@ -201,25 +201,25 @@ class EventMerger implements IEventMerger { case 2: $replacement = $this->l10n->t( '%1$s and %2$s', - ['{' . $parameter . '1}', '{' . $parameter . '2}'] + ['{' . $parameter . '2}', '{' . $parameter . '1}'] ); break; case 3: $replacement = $this->l10n->t( '%1$s, %2$s and %3$s', - ['{' . $parameter . '1}', '{' . $parameter . '2}', '{' . $parameter . '3}'] + ['{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}'] ); break; case 4: $replacement = $this->l10n->t( '%1$s, %2$s, %3$s and %4$s', - ['{' . $parameter . '1}', '{' . $parameter . '2}', '{' . $parameter . '3}', '{' . $parameter . '4}'] + ['{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}'] ); break; case 5: $replacement = $this->l10n->t( '%1$s, %2$s, %3$s, %4$s and %5$s', - ['{' . $parameter . '1}', '{' . $parameter . '2}', '{' . $parameter . '3}', '{' . $parameter . '4}', '{' . $parameter . '5}'] + ['{' . $parameter . '5}', '{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}'] ); break; default: |