Browse Source

Merge pull request #25034 from nextcloud/bugfix/noid/load-authentication-for-app-upgrades

Make sure to do priority app upgrades first
tags/v21.0.0beta6
Morris Jobke 3 years ago
parent
commit
8f614acade
No account linked to committer's email address
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      lib/private/Updater.php

+ 2
- 2
lib/private/Updater.php View File

@@ -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)]);

Loading…
Cancel
Save