upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 08:29:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Merge pull request #54204 from nextcloud/backport/54182/stable31

Browse source
This commit is contained in:
Benjamin Gaussorgues 2025-08-07 16:46:41 +02:00 committed by GitHub
commit 04e3943ff3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/private/Files/SetupManager.php
View file

@ -292,7 +292,7 @@ class SetupManager {
$mounts = array_filter($mounts, function (IMountPoint $mount) use ($previouslySetupProviders) {
return !in_array($mount->getMountProvider(), $previouslySetupProviders);
});
$this->userMountCache->registerMounts($user, $mounts, $newProviders);
$this->registerMounts($user, $mounts, $newProviders);
$cacheDuration = $this->config->getSystemValueInt('fs_mount_cache_duration', 5 * 60);
if ($cacheDuration > 0) {
@ -457,7 +457,7 @@ class SetupManager {
}
if (count($mounts)) {
$this->userMountCache->registerMounts($user, $mounts, $currentProviders);
$this->registerMounts($user, $mounts, $currentProviders);
$this->setupForUserWith($user, function () use ($mounts) {
array_walk($mounts, [$this->mountManager, 'addMount']);
});
@ -528,7 +528,7 @@ class SetupManager {
$mounts = $this->mountProviderCollection->getUserMountsForProviderClasses($user, $providers);
}
$this->userMountCache->registerMounts($user, $mounts, $providers);
$this->registerMounts($user, $mounts, $providers);
$this->setupForUserWith($user, function () use ($mounts) {
array_walk($mounts, [$this->mountManager, 'addMount']);
});
@ -600,4 +600,10 @@ class SetupManager {
});
}
}
private function registerMounts(IUser $user, array $mounts, ?array $mountProviderClasses = null): void {
if ($this->lockdownManager->canAccessFilesystem()) {
$this->userMountCache->registerMounts($user, $mounts, $mountProviderClasses);
}
}
}