aboutsummaryrefslogtreecommitdiffstats
path: root/lib/files/filesystem.php
diff options
context:
space:
mode:
authorThomas Mueller <thomas.mueller@tmit.eu>2013-02-12 00:32:38 +0100
committerThomas Mueller <thomas.mueller@tmit.eu>2013-02-12 00:32:38 +0100
commit76b31f870cf78aa8882761d954554fecb92e6211 (patch)
tree9c89430fe00983e94cc8864a12cd05242741d4c3 /lib/files/filesystem.php
parent0c31c3cc3a928e8ca9272d32d68163c0700697ea (diff)
parentfb23ac3ce2e0b3f002f036e55e516b672f088dc0 (diff)
downloadnextcloud-server-76b31f870cf78aa8882761d954554fecb92e6211.tar.gz
nextcloud-server-76b31f870cf78aa8882761d954554fecb92e6211.zip
Merge branch 'master' into master-sqlserver
Diffstat (limited to 'lib/files/filesystem.php')
-rw-r--r--lib/files/filesystem.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 71bf3d8708d..a0c3c4b9b75 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -190,14 +190,14 @@ class Filesystem {
}
}
- static public function init($root) {
+ static public function init($user, $root) {
if (self::$defaultInstance) {
return false;
}
self::$defaultInstance = new View($root);
//load custom mount config
- self::initMountPoints();
+ self::initMountPoints($user);
self::$loaded = true;