filter out oc_mounts results from non existing users

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2016-11-24 11:44:18 +01:00
parent f4cf125a4a
commit ce2f9493a7
No known key found for this signature in database
GPG Key ID: 425003AC385454C5
1 changed files with 6 additions and 3 deletions

View File

@ -188,6 +188,9 @@ class UserMountCache implements IUserMountCache {
private function dbRowToMountInfo(array $row) {
$user = $this->userManager->get($row['user_id']);
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']:'');
}
@ -205,7 +208,7 @@ class UserMountCache implements IUserMountCache {
$rows = $query->execute()->fetchAll();
$this->mountsForUsers[$user->getUID()] = array_map([$this, 'dbRowToMountInfo'], $rows);
$this->mountsForUsers[$user->getUID()] = array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
}
return $this->mountsForUsers[$user->getUID()];
}
@ -223,7 +226,7 @@ class UserMountCache implements IUserMountCache {
$rows = $query->execute()->fetchAll();
return array_map([$this, 'dbRowToMountInfo'], $rows);
return array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
}
/**
@ -239,7 +242,7 @@ class UserMountCache implements IUserMountCache {
$rows = $query->execute()->fetchAll();
return array_map([$this, 'dbRowToMountInfo'], $rows);
return array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
}
/**