diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2021-01-11 14:44:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-11 14:44:10 +0100 |
| commit | 8f614acade32cda82c9ea2763c24bc8f5a9594e8 (patch) | |
| tree | f44ef119c294eff55ccb9cff55633b3ef468a2d4 /lib/private/Updater.php | |
| parent | 6c8f2dc7bc4b4df6e4e09b28fb3d665ca55ba938 (diff) | |
| parent | f31edf1544f326ef289407a8dcfad01ef51901f3 (diff) | |
| download | nextcloud-server-8f614acade32cda82c9ea2763c24bc8f5a9594e8.tar.gz nextcloud-server-8f614acade32cda82c9ea2763c24bc8f5a9594e8.zip | |
Merge pull request #25034 from nextcloud/bugfix/noid/load-authentication-for-app-upgrades
Make sure to do priority app upgrades first
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 09aa955283c..65e2c9bd57f 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -268,7 +268,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 */ @@ -333,7 +332,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)]); |