From 7bf658ab180b6c15495f3033980ecf30eb61dc47 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Mon, 22 Feb 2016 22:02:05 +0100 Subject: Before installing new shipped apps we need to load authentication apps - fixes #22508 --- lib/private/updater.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/updater.php b/lib/private/updater.php index 78457ba3a80..f09910aba14 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -325,6 +325,7 @@ class Updater extends BasicEmitter { $this->doCoreUpgrade(); // install new shipped apps on upgrade + OC_App::loadApps('authentication'); OC_Installer::installShippedApps(); // update all shipped apps @@ -334,7 +335,6 @@ class Updater extends BasicEmitter { // upgrade appstore apps $this->upgradeAppStoreApps($disabledApps); - // post-upgrade repairs $repair = new Repair(Repair::getRepairSteps()); $this->emitRepairMessages($repair); -- cgit v1.2.3 From ad6238c808219557e90a1bbaf16e7b0369d67897 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Tue, 23 Feb 2016 10:31:11 +0100 Subject: Install new shipped apps after upgrading all existing apps --- lib/private/updater.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/private/updater.php b/lib/private/updater.php index f09910aba14..4f74481562b 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -324,10 +324,6 @@ class Updater extends BasicEmitter { if ($this->updateStepEnabled) { $this->doCoreUpgrade(); - // install new shipped apps on upgrade - OC_App::loadApps('authentication'); - OC_Installer::installShippedApps(); - // update all shipped apps $disabledApps = $this->checkAppsRequirements(); $this->doAppUpgrade(); @@ -335,6 +331,10 @@ 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()); $this->emitRepairMessages($repair); -- cgit v1.2.3 From bfde96a62346320756b1e7fd470e576db015454a Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Tue, 23 Feb 2016 15:57:12 +0100 Subject: Fix PHPDoc of OC_App::loadApps() --- lib/private/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3