From: Georg Ehrke <georg@ownCloud.com>
Date: Fri, 22 Feb 2013 13:19:29 +0000 (+0100)
Subject: fix order of mount commands
X-Git-Tag: v5.0.0beta2~26^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f51d8c1cd93f974a69252527ca020ab903b57656;p=nextcloud-server.git

fix order of mount commands
---

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