summaryrefslogtreecommitdiffstats
path: root/lib/files
diff options
context:
space:
mode:
authorThomas Mueller <thomas.mueller@tmit.eu>2013-05-15 23:43:46 +0200
committerThomas Mueller <thomas.mueller@tmit.eu>2013-05-15 23:43:46 +0200
commit5dcec346e54d63b41906bd2b77cb92d77aa52780 (patch)
treea5023fafaa48c59db5fb11cbe5a09cbd0e20ff68 /lib/files
parentd91161186b87965eab165ea536e026dde47df88a (diff)
parentdfddaf8fbf5ff515f26ff462c7ba6166b3d0ed18 (diff)
downloadnextcloud-server-5dcec346e54d63b41906bd2b77cb92d77aa52780.tar.gz
nextcloud-server-5dcec346e54d63b41906bd2b77cb92d77aa52780.zip
Merge branch 'master' into fix-3353
Diffstat (limited to 'lib/files')
-rw-r--r--lib/files/filesystem.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index eadd8a93faf..d60d430d77c 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -222,7 +222,10 @@ class Filesystem {
return false;
}
self::$defaultInstance = new View($root);
- self::$mounts = new Mount\Manager();
+
+ if(!self::$mounts) {
+ self::$mounts = new Mount\Manager();
+ }
//load custom mount config
self::initMountPoints($user);