diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2021-01-15 09:31:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-15 09:31:57 +0100 |
| commit | 48eea6f74b71272cdcbddedb70d655038785e063 (patch) | |
| tree | 368daabf271c09c8f8ca3d33c35d1c669d8d32cb /lib | |
| parent | 7c8d3709d95bcf51f132bb0aebe2ce5a8d1eb0c8 (diff) | |
| parent | f17033fa1276d74075d6bc00fa8725f2999b2e83 (diff) | |
| download | nextcloud-server-48eea6f74b71272cdcbddedb70d655038785e063.tar.gz nextcloud-server-48eea6f74b71272cdcbddedb70d655038785e063.zip | |
Merge pull request #25077 from nextcloud/backport/25034/stable20
[stable20] Make sure to do priority app upgrades first
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 3bf2cb1b6f9..c1ecd3e7c0d 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -266,7 +266,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 */ @@ -372,7 +371,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)]); |