summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2022-04-06 11:58:37 +0000
committerGitHub <noreply@github.com>2022-04-06 11:58:37 +0000
commitef9890fb7857282f13a8c72def13475de1e1909e (patch)
tree9cb110fd36743f64b41f3620e2e421cb4142023c
parent3b98db15e1386aac18bc7041e3d1c9b1b5617e17 (diff)
parent7eca0a25530ff68b5eb169fc9d595f4fa97852fa (diff)
downloadnextcloud-server-ef9890fb7857282f13a8c72def13475de1e1909e.tar.gz
nextcloud-server-ef9890fb7857282f13a8c72def13475de1e1909e.zip
Merge pull request #31844 from nextcloud/fs-home-only-setup
only setup home mount when getting home folder
-rw-r--r--apps/files/lib/Controller/AjaxController.php1
-rw-r--r--lib/private/Files/SetupManager.php6
2 files changed, 6 insertions, 1 deletions
diff --git a/apps/files/lib/Controller/AjaxController.php b/apps/files/lib/Controller/AjaxController.php
index 000d950595d..cd26ab7a6f8 100644
--- a/apps/files/lib/Controller/AjaxController.php
+++ b/apps/files/lib/Controller/AjaxController.php
@@ -40,7 +40,6 @@ class AjaxController extends Controller {
* @NoAdminRequired
*/
public function getStorageStats(string $dir = '/'): JSONResponse {
- \OC_Util::setupFS();
try {
return new JSONResponse([
'status' => 'success',
diff --git a/lib/private/Files/SetupManager.php b/lib/private/Files/SetupManager.php
index ddb0bbceb81..d091b5c5e35 100644
--- a/lib/private/Files/SetupManager.php
+++ b/lib/private/Files/SetupManager.php
@@ -367,6 +367,12 @@ class SetupManager {
return;
}
+ // for the user's home folder, it's always the home mount
+ if (rtrim($path) === "/" . $user->getUID() . "/files" && !$includeChildren) {
+ $this->oneTimeUserSetup($user);
+ return;
+ }
+
if (!isset($this->setupUserMountProviders[$user->getUID()])) {
$this->setupUserMountProviders[$user->getUID()] = [];
}