summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-02-23 10:31:11 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-02-23 10:31:11 +0100
commitad6238c808219557e90a1bbaf16e7b0369d67897 (patch)
tree76a93338905294826c7d9a1c37d741e7b37e774a /lib
parent7bf658ab180b6c15495f3033980ecf30eb61dc47 (diff)
downloadnextcloud-server-ad6238c808219557e90a1bbaf16e7b0369d67897.tar.gz
nextcloud-server-ad6238c808219557e90a1bbaf16e7b0369d67897.zip
Install new shipped apps after upgrading all existing apps
Diffstat (limited to 'lib')
-rw-r--r--lib/private/updater.php8
1 files 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);