diff options
| author | Julius Härtl <jus@bitgrid.net> | 2021-01-08 12:27:51 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2021-01-08 12:27:54 +0100 |
| commit | f31edf1544f326ef289407a8dcfad01ef51901f3 (patch) | |
| tree | f9032ac0a34696067daf7ba981f7b9c357ebd8a4 /lib/private/Updater.php | |
| parent | 7001f036453f5d79d3c44fdb82fdccf43c6e60db (diff) | |
| download | nextcloud-server-f31edf1544f326ef289407a8dcfad01ef51901f3.tar.gz nextcloud-server-f31edf1544f326ef289407a8dcfad01ef51901f3.zip | |
Make sure to do priority app upgrades first
Otherwise those apps might not be loaded when the others app migrations
are running. The previous loading of authentication apps in the upgrade
step never worked as it just returns in maintenance mode
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib/private/Updater.php')
| -rw-r--r-- | lib/private/Updater.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Updater.php b/lib/private/Updater.php index ec0a50cc6ca..2cea7c23105 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -267,7 +267,6 @@ class Updater extends BasicEmitter { $this->upgradeAppStoreApps($autoDisabledApps, true); // install new shipped apps on upgrade - OC_App::loadApps(['authentication']); $errors = Installer::installShippedApps(true); foreach ($errors as $appId => $exception) { /** @var \Exception $exception */ @@ -332,7 +331,8 @@ class Updater extends BasicEmitter { $stacks[$pseudoOtherType][] = $appId; } } - foreach ($stacks as $type => $stack) { + foreach (array_merge($priorityTypes, [$pseudoOtherType]) as $type) { + $stack = $stacks[$type]; foreach ($stack as $appId) { if (\OC_App::shouldUpgrade($appId)) { $this->emit('\OC\Updater', 'appUpgradeStarted', [$appId, \OC_App::getAppVersion($appId)]); |