From b9898c5b875cd4df30667cee8fe83576253081b7 Mon Sep 17 00:00:00 2001 From: Dariusz Olszewski Date: Fri, 27 Oct 2017 23:22:35 +0200 Subject: [PATCH] Improve performance of UserMountCache with external storage folders Signed-off-by: Morris Jobke --- lib/private/Files/Config/UserMountCache.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/private/Files/Config/UserMountCache.php b/lib/private/Files/Config/UserMountCache.php index 6ec78e4d81c..5829fdf512c 100644 --- a/lib/private/Files/Config/UserMountCache.php +++ b/lib/private/Files/Config/UserMountCache.php @@ -193,7 +193,11 @@ class UserMountCache implements IUserMountCache { if (is_null($user)) { return null; } - return new CachedMountInfo($user, (int)$row['storage_id'], (int)$row['root_id'], $row['mount_point'], $row['mount_id'], isset($row['path'])? $row['path']:''); + $mount_id = $row['mount_id']; + if (!is_null($mount_id)) { + $mount_id = (int) $mount_id; + } + return new CachedMountInfo($user, (int)$row['storage_id'], (int)$row['root_id'], $row['mount_point'], $mount_id, isset($row['path'])? $row['path']:''); } /** -- 2.39.5