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(-) (limited to 'lib') 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