diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-25 21:43:32 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-25 21:43:32 +0100 |
| commit | cb41b1a86397579d55e0ce96e67b80a83037d1d2 (patch) | |
| tree | b51a53907caaa64f3be95daf88a786649aad11dd | |
| parent | 290f159a97acd22dac0aac137654b93661a8dc38 (diff) | |
| parent | bfde96a62346320756b1e7fd470e576db015454a (diff) | |
| download | nextcloud-server-cb41b1a86397579d55e0ce96e67b80a83037d1d2.tar.gz nextcloud-server-cb41b1a86397579d55e0ce96e67b80a83037d1d2.zip | |
Merge pull request #22584 from owncloud/fix-app-load-order-fixes-22508
Before installing new shipped apps we need to load authentication apps
| -rw-r--r-- | lib/private/app.php | 2 | ||||
| -rw-r--r-- | lib/private/updater.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/app.php b/lib/private/app.php index 49d4e942a09..787029b653b 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -87,7 +87,7 @@ class OC_App { /** * loads all apps * - * @param array $types + * @param string[] | string | null $types * @return bool * * This function walks through the ownCloud directory and loads all apps diff --git a/lib/private/updater.php b/lib/private/updater.php index 78457ba3a80..4f74481562b 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -324,9 +324,6 @@ class Updater extends BasicEmitter { if ($this->updateStepEnabled) { $this->doCoreUpgrade(); - // install new shipped apps on upgrade - OC_Installer::installShippedApps(); - // update all shipped apps $disabledApps = $this->checkAppsRequirements(); $this->doAppUpgrade(); @@ -334,6 +331,9 @@ class Updater extends BasicEmitter { // upgrade appstore apps $this->upgradeAppStoreApps($disabledApps); + // install new shipped apps on upgrade + OC_App::loadApps('authentication'); + OC_Installer::installShippedApps(); // post-upgrade repairs $repair = new Repair(Repair::getRepairSteps()); |