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

Before installing new shipped apps we need to load authentication apps

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

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());