summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorGeorg Ehrke <georg@ownCloud.com>2013-02-22 14:19:29 +0100
committerGeorg Ehrke <georg@ownCloud.com>2013-02-22 14:19:29 +0100
commitf51d8c1cd93f974a69252527ca020ab903b57656 (patch)
treecd0ae40d6ec757f49420a66837801c1d7d34891d /lib
parentc0443a2f0da13a6f3c10690887fb1b44a95f7106 (diff)
downloadnextcloud-server-f51d8c1cd93f974a69252527ca020ab903b57656.tar.gz
nextcloud-server-f51d8c1cd93f974a69252527ca020ab903b57656.zip
fix order of mount commands
Diffstat (limited to 'lib')
-rw-r--r--lib/files/filesystem.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 875a9d6c5ee..8f171283207 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -219,6 +219,9 @@ class Filesystem {
}
$parser = new \OC\ArrayParser();
+ $root = \OC_User::getHome($user);
+ self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user);
+
// Load system mount points
if (is_file(\OC::$SERVERROOT . '/config/mount.php') or is_file(\OC::$SERVERROOT . '/config/mount.json')) {
if(is_file(\OC::$SERVERROOT . '/config/mount.json')){
@@ -259,8 +262,6 @@ class Filesystem {
}
}
// Load personal mount points
- $root = \OC_User::getHome($user);
- self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user);
if (is_file($root . '/mount.php') or is_file($root . '/mount.json')) {
if (is_file($root . '/mount.json')){
$mountConfig = json_decode(file_get_contents($root . '/mount.json'), true);