summaryrefslogtreecommitdiffstats
path: root/lib/files
diff options
context:
space:
mode:
authorFlorin Peter <github@florin-peter.de>2013-05-20 02:25:56 +0200
committerFlorin Peter <github@florin-peter.de>2013-05-20 02:25:56 +0200
commit31037241e11122203f2ea73b6c1b126a14bfdae2 (patch)
treec783857d7a61c48d913a252fb05e99e6389fb937 /lib/files
parent58a8d67a9b3c48567bcc40cc02444311c6773275 (diff)
parent71668cf08a57742c0a585c9e2fe7e4bb0ea08165 (diff)
downloadnextcloud-server-31037241e11122203f2ea73b6c1b126a14bfdae2.tar.gz
nextcloud-server-31037241e11122203f2ea73b6c1b126a14bfdae2.zip
Merge branch 'master' into files_encryption
Diffstat (limited to 'lib/files')
-rw-r--r--lib/files/cache/backgroundwatcher.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/files/cache/backgroundwatcher.php b/lib/files/cache/backgroundwatcher.php
index 7549745e7d7..8933101577d 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 = Filesystem::getMountByStorageId($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
@@ -40,7 +40,7 @@ class BackgroundWatcher {
return;
}
Filesystem::initMountPoints($users[0]);
- $mounts = Mount::findByStorageId($storageId);
+ $mounts = Filesystem::getMountByStorageId($storageId);
if (count($mounts) === 0) {
return;
}