wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Update - Only add one section for disabled apps
This commit is contained in:
Thomas Müller 2015-10-21 12:48:40 +02:00
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();
}
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'));
}