aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-02-03 11:36:04 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-02-03 11:36:04 +0100
commit459a12c8b375eb3fe65a8790710716d624ef1228 (patch)
tree360f9f95f5ed907a1418e542e62878f1585c16c0 /lib
parent85174d85267ca5bca3bfe57f09ef08eb5b7d1b1d (diff)
parent8a30058f52c7b2074ecb9da40fba622cfd935f2f (diff)
downloadnextcloud-server-459a12c8b375eb3fe65a8790710716d624ef1228.tar.gz
nextcloud-server-459a12c8b375eb3fe65a8790710716d624ef1228.zip
Merge pull request #22081 from owncloud/mount-cache-invalid-storage
filter invalid storages from the mount cache early
Diffstat (limited to 'lib')
-rw-r--r--lib/private/files/config/usermountcache.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/files/config/usermountcache.php b/lib/private/files/config/usermountcache.php
index 7d7b03fbc06..a2da3e9f528 100644
--- a/lib/private/files/config/usermountcache.php
+++ b/lib/private/files/config/usermountcache.php
@@ -74,7 +74,7 @@ class UserMountCache implements IUserMountCache {
public function registerMounts(IUser $user, array $mounts) {
// filter out non-proper storages coming from unit tests
$mounts = array_filter($mounts, function (IMountPoint $mount) {
- return $mount->getStorage()->getCache();
+ return $mount->getStorage() && $mount->getStorage()->getCache();
});
/** @var ICachedMountInfo[] $newMounts */
$newMounts = array_map(function (IMountPoint $mount) use ($user) {