From e66e67567f778e7f7b4871e3bfb055beb8de1517 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 21 Oct 2015 10:39:56 +0200 Subject: [PATCH] Update - Only add one section for disabled apps --- core/ajax/update.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/core/ajax/update.php b/core/ajax/update.php index 11d159f15d..2af110deaa 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -112,15 +112,18 @@ if (OC::checkUpgrade(false)) { exit(); } - if (!empty($incompatibleApps)) { - $eventSource->send('notice', - (string)$l->t('Following incompatible apps have been disabled: %s', implode(', ', $incompatibleApps))); + $disabledApps = []; + foreach ($disabledThirdPartyApps as $app) { + $disabledApps[$app] = (string) $l->t('%s (3rdparty)', [$app]); } - if (!empty($disabledThirdPartyApps)) { - $eventSource->send('notice', - (string)$l->t('Following apps have been disabled: %s', implode(', ', $disabledThirdPartyApps))); + foreach ($incompatibleApps as $app) { + $disabledApps[$app] = (string) $l->t('%s (incompatible)', [$app]); } + if (!empty($disabledApps)) { + $eventSource->send('notice', + (string)$l->t('Following apps have been disabled: %s', implode(', ', $disabledApps))); + } } else { $eventSource->send('notice', (string)$l->t('Already up to date')); }