aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2025-03-07 17:51:17 +0100
committerRobin Appelman <robin@icewind.nl>2025-03-19 16:43:58 +0100
commitda772b275c54ebd3edfe5c1d0a85c854e48888d7 (patch)
treec8ba582fc2367e469e26dc0a00c3823ffd13a5b6
parent786fd2b31df1a87310bc12a0400d548b99789837 (diff)
downloadnextcloud-server-da772b275c54ebd3edfe5c1d0a85c854e48888d7.tar.gz
nextcloud-server-da772b275c54ebd3edfe5c1d0a85c854e48888d7.zip
fix: fix "new mount" false positives
Signed-off-by: Robin Appelman <robin@icewind.nl>
-rw-r--r--lib/private/Files/Config/MountProviderCollection.php4
-rw-r--r--lib/private/Files/SetupManager.php4
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/Files/Config/MountProviderCollection.php b/lib/private/Files/Config/MountProviderCollection.php
index 0e103690b6b..d120e59b766 100644
--- a/lib/private/Files/Config/MountProviderCollection.php
+++ b/lib/private/Files/Config/MountProviderCollection.php
@@ -238,4 +238,8 @@ class MountProviderCollection implements IMountProviderCollection, Emitter {
public function getProviders(): array {
return $this->providers;
}
+
+ public function getHomeProviders(): array {
+ return $this->homeProviders;
+ }
}
diff --git a/lib/private/Files/SetupManager.php b/lib/private/Files/SetupManager.php
index 4d1e379ea58..8f4c3a3311f 100644
--- a/lib/private/Files/SetupManager.php
+++ b/lib/private/Files/SetupManager.php
@@ -275,9 +275,9 @@ class SetupManager {
$mounts = array_filter($mounts, function (IMountPoint $mount) use ($userRoot) {
return str_starts_with($mount->getMountPoint(), $userRoot);
});
- $allProviders = array_map(function (IMountProvider $provider) {
+ $allProviders = array_map(function ($provider) {
return get_class($provider);
- }, $this->mountProviderCollection->getProviders());
+ }, array_merge($this->mountProviderCollection->getProviders(), $this->mountProviderCollection->getHomeProviders()));
$newProviders = array_diff($allProviders, $previouslySetupProviders);
$mounts = array_filter($mounts, function (IMountPoint $mount) use ($previouslySetupProviders) {
return !in_array($mount->getMountProvider(), $previouslySetupProviders);