always do full setup for home folder with submounts

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/lib/private/Files/SetupManager.php b/lib/private/Files/SetupManager.php
index 204d057a240ce8ffdde0edad07d10fc6de6bc247..e0575ea92a58e1e92900c7b49a41d16ed1d1708e 100644 (file)
--- a/lib/private/Files/SetupManager.php
+++ b/lib/private/Files/SetupManager.php
@@ -368,8 +368,12 @@ class SetupManager {
                }
 
                // for the user's home folder, it's always the home mount
-               if (rtrim($path) === "/" . $user->getUID() . "/files" && !$includeChildren) {
-                       $this->oneTimeUserSetup($user);
+               if (rtrim($path) === "/" . $user->getUID() . "/files") {
+                       if ($includeChildren) {
+                               $this->setupForUser($user);
+                       } else {
+                               $this->oneTimeUserSetup($user);
+                       }
                        return;
                }