From 079f918d5ca0d242e77717aaeac82bcf011dc745 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sun, 19 May 2013 22:30:03 +0200
Subject: [PATCH] fix for webdav and wrong reference for findByStorageId
---
lib/files/cache/backgroundwatcher.php | 2 +-
lib/files/filesystem.php | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/files/cache/backgroundwatcher.php b/lib/files/cache/backgroundwatcher.php
index 7549745e7d..b5770d0582 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 d60d430d77..d0cac9dc1d 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();
+ }
}
/**
--
GitLab