summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Peter <github@florin-peter.de>2013-05-19 22:30:03 +0200
committerFlorin Peter <github@florin-peter.de>2013-05-19 22:30:03 +0200
commit079f918d5ca0d242e77717aaeac82bcf011dc745 (patch)
tree81fb8afb4a6f2950ba3a510534e79f7a1107c30c
parentbdd2127f19db92d7f3eccfa0cee402add23529f6 (diff)
downloadnextcloud-server-079f918d5ca0d242e77717aaeac82bcf011dc745.tar.gz
nextcloud-server-079f918d5ca0d242e77717aaeac82bcf011dc745.zip
fix for webdav and wrong reference for findByStorageId
-rw-r--r--lib/files/cache/backgroundwatcher.php2
-rw-r--r--lib/files/filesystem.php4
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/files/cache/backgroundwatcher.php b/lib/files/cache/backgroundwatcher.php
index 7549745e7d7..b5770d0582b 100644
--- a/lib/files/cache/backgroundwatcher.php
+++ b/lib/files/cache/backgroundwatcher.php
@@ -30,7 +30,7 @@ class BackgroundWatcher {
return;
}
list($storageId, $internalPath) = $cacheItem;
- $mounts = Mount::findByStorageId($storageId);
+ $mounts = Mount\Manager::findByStorageId($storageId);
if (count($mounts) === 0) {
//if the storage we need isn't mounted on default, try to find a user that has access to the storage
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index d60d430d77c..d0cac9dc1d3 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -236,7 +236,9 @@ class Filesystem {
}
static public function initMounts(){
- self::$mounts = new Mount\Manager();
+ if(!self::$mounts) {
+ self::$mounts = new Mount\Manager();
+ }
}
/**