]> source.dussan.org Git - nextcloud-server.git/commitdiff
fix order of mount commands
authorGeorg Ehrke <georg@ownCloud.com>
Fri, 22 Feb 2013 13:19:29 +0000 (14:19 +0100)
committerGeorg Ehrke <georg@ownCloud.com>
Fri, 22 Feb 2013 13:19:29 +0000 (14:19 +0100)
lib/files/filesystem.php

index 875a9d6c5eea8df49bbade8cf6e682a52c707775..8f171283207149772eef74800135b10886ba091d 100644 (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);