summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-10-29 13:12:28 +0100
committerRobin Appelman <icewind@owncloud.com>2013-10-29 13:12:28 +0100
commit0e92a4896df11d6fd3ee4ed73dfa1cb121d66895 (patch)
tree010455ae67237dca4126dc10a92a16cc234a2e4d /lib
parente273c14540ed9bbf65d68e0847447466315268f8 (diff)
downloadnextcloud-server-0e92a4896df11d6fd3ee4ed73dfa1cb121d66895.tar.gz
nextcloud-server-0e92a4896df11d6fd3ee4ed73dfa1cb121d66895.zip
dont use the home storage for non-existing users
Diffstat (limited to 'lib')
-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 beed3831081..e40502bbe64 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -306,10 +306,10 @@ class Filesystem {
$root = \OC_User::getHome($user);
- if (\OC\Files\Cache\Storage::exists('local::' . $root . '/')) {
+ $userObject = \OC_User::getManager()->get($user);
+ if (\OC\Files\Cache\Storage::exists('local::' . $root . '/') or is_null($userObject)) {
self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user);
} else {
- $userObject = \OC_User::getManager()->get($user);
self::mount('\OC\Files\Storage\Home', array('user' => $userObject), $user);
}
$datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data");