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

Merge pull request #25077 from nextcloud/backport/25034/stable20 

[stable20] Make sure to do priority app upgrades first
This commit is contained in:
Morris Jobke 2021-01-15 09:31:57 +01:00 committed by GitHub
parent 7c8d3709d9 f17033fa12
commit 48eea6f74b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/Updater.php
View File

@ -266,7 +266,6 @@ class Updater extends BasicEmitter {
$this->upgradeAppStoreApps($autoDisabledApps, true); $this->upgradeAppStoreApps($autoDisabledApps, true);
// install new shipped apps on upgrade // install new shipped apps on upgrade
OC_App::loadApps(['authentication']);
$errors = Installer::installShippedApps(true); $errors = Installer::installShippedApps(true);
foreach ($errors as $appId => $exception) { foreach ($errors as $appId => $exception) {
/** @var \Exception $exception */ /** @var \Exception $exception */
@ -372,7 +371,8 @@ class Updater extends BasicEmitter {
$stacks[$pseudoOtherType][] = $appId; $stacks[$pseudoOtherType][] = $appId;
} }
} }
foreach ($stacks as $type => $stack) { foreach (array_merge($priorityTypes, [$pseudoOtherType]) as $type) {
$stack = $stacks[$type];
foreach ($stack as $appId) { foreach ($stack as $appId) {
if (\OC_App::shouldUpgrade($appId)) { if (\OC_App::shouldUpgrade($appId)) {
$this->emit('\OC\Updater', 'appUpgradeStarted', [$appId, \OC_App::getAppVersion($appId)]); $this->emit('\OC\Updater', 'appUpgradeStarted', [$appId, \OC_App::getAppVersion($appId)]);