From 644b37c7e4226593d8d2d450d6ce9d3a77798885 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 28 Mar 2017 17:19:34 +0200 Subject: [PATCH] Change the order on merging activities so the newest item is first Signed-off-by: Joas Schilling --- lib/private/Activity/EventMerger.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/private/Activity/EventMerger.php b/lib/private/Activity/EventMerger.php index 91e7906866..04aa41b269 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: