mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22584 from owncloud/fix-app-load-order-fixes-22508 

Before installing new shipped apps we need to load authentication apps
This commit is contained in:
Thomas Müller 2016-02-25 21:43:32 +01:00
parent 290f159a97 bfde96a623
commit cb41b1a863
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/app.php
View File

@ -87,7 +87,7 @@ class OC_App {
/** /**
* loads all apps * loads all apps
* *
* @param array $types * @param string[] | string | null $types
* @return bool * @return bool
* *
* This function walks through the ownCloud directory and loads all apps * This function walks through the ownCloud directory and loads all apps

6
lib/private/updater.php
View File

@ -324,9 +324,6 @@ class Updater extends BasicEmitter {
if ($this->updateStepEnabled) { if ($this->updateStepEnabled) {
$this->doCoreUpgrade(); $this->doCoreUpgrade();
// install new shipped apps on upgrade
OC_Installer::installShippedApps();
// update all shipped apps // update all shipped apps
$disabledApps = $this->checkAppsRequirements(); $disabledApps = $this->checkAppsRequirements();
$this->doAppUpgrade(); $this->doAppUpgrade();
@ -334,6 +331,9 @@ class Updater extends BasicEmitter {
// upgrade appstore apps // upgrade appstore apps
$this->upgradeAppStoreApps($disabledApps); $this->upgradeAppStoreApps($disabledApps);
// install new shipped apps on upgrade
OC_App::loadApps('authentication');
OC_Installer::installShippedApps();
// post-upgrade repairs // post-upgrade repairs
$repair = new Repair(Repair::getRepairSteps()); $repair = new Repair(Repair::getRepairSteps());