Skip to content

Commit 7fe272f

Browse files
committed
fix(Coordinator): ensure the core app is loaded first
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
1 parent a18e61a commit 7fe272f

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

lib/base.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -781,8 +781,6 @@ public static function init(): void {
781781
// Make sure that the application class is not loaded before the database is setup
782782
if ($systemConfig->getValue('installed', false)) {
783783
$appManager->loadApp('settings');
784-
/* Run core application registration */
785-
$bootstrapCoordinator->runLazyRegistration('core');
786784
}
787785

788786
//make sure temporary files are cleaned up

lib/private/AppFramework/Bootstrap/Coordinator.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,13 @@ public function __construct(
4646
}
4747

4848
public function runInitialRegistration(): void {
49-
$this->registerApps(OC_App::getEnabledApps());
49+
$apps = OC_App::getEnabledApps();
50+
if (!empty($apps)) {
51+
// make sure to also register the core app
52+
$apps = ['core', ...$apps];
53+
}
54+
55+
$this->registerApps($apps);
5056
}
5157

5258
public function runLazyRegistration(string $appId): void {

0 commit comments

Comments
 (0)