diff options
| author | Julius Härtl <jus@bitgrid.net> | 2021-01-08 12:27:51 +0100 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2021-01-11 13:49:12 +0000 |
| commit | 16850b940f2f22409b7dfaa6b40d2b5b0946ce21 (patch) | |
| tree | bb2e4c77bbaf8584ed510efaa58fab28d7dd8520 /lib | |
| parent | f5c98642f7c395996759aaf00d4722f290d0af9b (diff) | |
| download | nextcloud-server-16850b940f2f22409b7dfaa6b40d2b5b0946ce21.tar.gz nextcloud-server-16850b940f2f22409b7dfaa6b40d2b5b0946ce21.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')
| -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 4b5d02aeb64..da985faa779 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -262,7 +262,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 */ @@ -368,7 +367,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)]); |