Merge pull request #19924 from owncloud/issue-19891-update-lists-disabled-apps-twice

Update - Only add one section for disabled apps

1 files changed, 9 insertions, 6 deletions

diff --git a/core/ajax/update.php b/core/ajax/update.php
index 11d159f15d1..2af110deaa4 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'));
 }