mirror of
https://github.com/nextcloud/server.git
synced 2026-06-09 08:44:07 -04:00
fix: make sure the core app is loaded
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
parent
0746f49dd1
commit
0abaf60352
3 changed files with 7 additions and 7 deletions
|
|
@ -867,6 +867,7 @@ class OC {
|
|||
|
||||
// Make sure that the application class is not loaded before the database is setup
|
||||
if ($systemConfig->getValue('installed', false)) {
|
||||
$appManager->loadApp('core');
|
||||
$appManager->loadApp('settings');
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1189,8 +1189,11 @@ class AppManager implements IAppManager {
|
|||
|
||||
#[\Override]
|
||||
public function getAppNamespace(string $appId): string {
|
||||
$topNamespace = 'OCA\\';
|
||||
if ($appId === 'core') {
|
||||
return 'OC\\Core';
|
||||
}
|
||||
|
||||
$topNamespace = 'OCA\\';
|
||||
// Hit the cache!
|
||||
if (isset($this->namespaceCache[$appId])) {
|
||||
return $topNamespace . $this->namespaceCache[$appId];
|
||||
|
|
|
|||
|
|
@ -212,10 +212,6 @@ class NavigationManager implements INavigationManager {
|
|||
}
|
||||
|
||||
foreach ($apps as $app) {
|
||||
if (!$this->userSession->isLoggedIn() && !$this->appManager->isEnabledForUser($app, $this->userSession->getUser())) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// load plugins and collections from info.xml
|
||||
$info = $this->appManager->getAppInfo($app);
|
||||
if (!isset($info['navigations']['navigation'])) {
|
||||
|
|
@ -261,14 +257,14 @@ class NavigationManager implements INavigationManager {
|
|||
'order' => $order,
|
||||
// Target of the navigation entry
|
||||
'href' => $route,
|
||||
// The icon used for the naviation entry
|
||||
// The icon used for the navigation entry
|
||||
'icon' => $icon,
|
||||
// Type of the navigation entry ('link' vs 'settings')
|
||||
'type' => $type,
|
||||
// Localized name of the navigation entry
|
||||
'name' => $l->t($nav['name']),
|
||||
], $type === 'link' ? [
|
||||
// App that registered this navigation entry (not necessarly the same as the id)
|
||||
// App that registered this navigation entry (not necessarily the same as the id)
|
||||
'app' => $app,
|
||||
] : []
|
||||
));
|
||||
|
|
|
|||
Loading…
Reference in a new issue