mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1854 from owncloud/fix_mount_order 

Fix order of mount commands in lib/files/filesystem.php
This commit is contained in:
blizzz 2013-02-22 05:37:31 -08:00
parent c0443a2f0d f51d8c1cd9
commit 5c76fffc01
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/files/filesystem.php
View File

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