mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7120 from nextcloud/12-6988 

[stable12] Improve performance of UserMountCache with external storage folders
This commit is contained in:
Morris Jobke 2017-11-09 17:16:00 +01:00 committed by GitHub
parent ab69cea7b2 b9898c5b87
commit 20e5220103
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/Files/Config/UserMountCache.php
View File

@ -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']:'');
}
/**