From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 29 Oct 2013 12:12:28 +0000 (+0100)
Subject: dont use the home storage for non-existing users
X-Git-Tag: v6.0.0beta3~29^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0e92a4896df11d6fd3ee4ed73dfa1cb121d66895;p=nextcloud-server.git

dont use the home storage for non-existing users
---

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");