summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Peter <github@florin-peter.de>2013-05-20 01:47:35 +0200
committerFlorin Peter <github@florin-peter.de>2013-05-20 01:47:35 +0200
commitb3b6738d599480fc9bf40a53313598c4766571fb (patch)
tree80eed3bf5817b64b50c596e156a9f0337febea59
parent3b850a2524471030da27227cba18b31ffc998aa4 (diff)
downloadnextcloud-server-b3b6738d599480fc9bf40a53313598c4766571fb.tar.gz
nextcloud-server-b3b6738d599480fc9bf40a53313598c4766571fb.zip
Revert "fix for webdav and wrong reference for findByStorageId"
This reverts commit 079f918d5ca0d242e77717aaeac82bcf011dc745.
-rw-r--r--lib/files/cache/backgroundwatcher.php2
-rw-r--r--lib/files/filesystem.php4
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/files/cache/backgroundwatcher.php b/lib/files/cache/backgroundwatcher.php
index b5770d0582b..7549745e7d7 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\Manager::findByStorageId($storageId);
+ $mounts = Mount::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 d0cac9dc1d3..d60d430d77c 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -236,9 +236,7 @@ class Filesystem {
}
static public function initMounts(){
- if(!self::$mounts) {
- self::$mounts = new Mount\Manager();
- }
+ self::$mounts = new Mount\Manager();
}
/**