aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/files/filesystem.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-10-29 00:26:35 +0100
committerRobin Appelman <icewind@owncloud.com>2013-10-29 00:26:35 +0100
commite273c14540ed9bbf65d68e0847447466315268f8 (patch)
tree97b32780a84b820604314b3fc3cc283f1b9118a2 /lib/private/files/filesystem.php
parentf1e6e80eb1be9a6ef4e96e1e6c4a3e838bbd69db (diff)
downloadnextcloud-server-e273c14540ed9bbf65d68e0847447466315268f8.tar.gz
nextcloud-server-e273c14540ed9bbf65d68e0847447466315268f8.zip
use the new home storage backend when no existing local storage backend exists for the user's home
Diffstat (limited to 'lib/private/files/filesystem.php')
-rw-r--r--lib/private/files/filesystem.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index 10ec5c41d11..beed3831081 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -305,7 +305,13 @@ class Filesystem {
$parser = new \OC\ArrayParser();
$root = \OC_User::getHome($user);
- self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user);
+
+ if (\OC\Files\Cache\Storage::exists('local::' . $root . '/')) {
+ 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");
//move config file to it's new position