summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorThomas Müller <DeepDiver1975@users.noreply.github.com>2016-04-22 17:25:40 +0200
committerThomas Müller <DeepDiver1975@users.noreply.github.com>2016-04-22 17:25:40 +0200
commit8c7c713e86ed144b1a5e80ea27fdba4744b6d09d (patch)
tree298b4e499f2ac435e931fe683ee522651145c99c /lib/private
parente37b95ae53d098ffa93018e90d2443867f047a4f (diff)
parent13c01e62cf9cd1d241b447b80fda719fb2df9931 (diff)
downloadnextcloud-server-8c7c713e86ed144b1a5e80ea27fdba4744b6d09d.tar.gz
nextcloud-server-8c7c713e86ed144b1a5e80ea27fdba4744b6d09d.zip
Merge pull request #24187 from owncloud/fs-initmountpoint-rethrowifusernotfoundagain
Mark $usersSetup only if user was found in initMountPoints
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/files/filesystem.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index ec9b537a358..7283c815c97 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -378,8 +378,6 @@ class Filesystem {
if (isset(self::$usersSetup[$user])) {
return;
}
- self::$usersSetup[$user] = true;
-
$root = \OC_User::getHome($user);
$userManager = \OC::$server->getUserManager();
@@ -390,6 +388,8 @@ class Filesystem {
throw new \OC\User\NoUserException('Backends provided no user object for ' . $user);
}
+ self::$usersSetup[$user] = true;
+
$homeStorage = \OC::$server->getConfig()->getSystemValue('objectstore');
if (!empty($homeStorage)) {
// sanity checks