Merge pull request #6988 from starypatyk/stable12-mount-cache-performance

Improve performance of UserMountCache with external storage folders
This commit is contained in:
Morris Jobke 2017-11-07 17:32:06 +01:00 committed by GitHub
commit 19069f2b9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions

View File

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