mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Update - Only add one section for disabled apps
This commit is contained in:
Thomas Müller 2015-10-21 12:48:40 +02:00
parent d0aeb268d6 e66e67567f
commit ab8616b2f8
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/ajax/update.php
View File

@ -112,15 +112,18 @@ if (OC::checkUpgrade(false)) {
exit(); exit();
} }
if (!empty($incompatibleApps)) { $disabledApps = [];
$eventSource->send('notice', foreach ($disabledThirdPartyApps as $app) {
(string)$l->t('Following incompatible apps have been disabled: %s', implode(', ', $incompatibleApps))); $disabledApps[$app] = (string) $l->t('%s (3rdparty)', [$app]);
} }
if (!empty($disabledThirdPartyApps)) { foreach ($incompatibleApps as $app) {
$eventSource->send('notice', $disabledApps[$app] = (string) $l->t('%s (incompatible)', [$app]);
(string)$l->t('Following apps have been disabled: %s', implode(', ', $disabledThirdPartyApps)));
} }
if (!empty($disabledApps)) {
$eventSource->send('notice',
(string)$l->t('Following apps have been disabled: %s', implode(', ', $disabledApps)));
}
} else { } else {
$eventSource->send('notice', (string)$l->t('Already up to date')); $eventSource->send('notice', (string)$l->t('Already up to date'));
} }