diff options
| author | blizzz <blizzz@owncloud.com> | 2013-02-22 05:37:31 -0800 |
|---|---|---|
| committer | blizzz <blizzz@owncloud.com> | 2013-02-22 05:37:31 -0800 |
| commit | 5c76fffc01cb01fca41863b9a35ea5f14175b861 (patch) | |
| tree | cd0ae40d6ec757f49420a66837801c1d7d34891d | |
| parent | c0443a2f0da13a6f3c10690887fb1b44a95f7106 (diff) | |
| parent | f51d8c1cd93f974a69252527ca020ab903b57656 (diff) | |
| download | nextcloud-server-5c76fffc01cb01fca41863b9a35ea5f14175b861.tar.gz nextcloud-server-5c76fffc01cb01fca41863b9a35ea5f14175b861.zip | |
Merge pull request #1854 from owncloud/fix_mount_order
Fix order of mount commands in lib/files/filesystem.php
| -rw-r--r-- | lib/files/filesystem.php | 5 |
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); |