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

Don't fail contacts menu on unkown user 

If for some reason the system addressbook holds a user that is no longer
accessible from the usermanager (so it got somehow out of sync) we
should not fail hard but rather just ignore the entry.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-07-19 11:39:28 +02:00
parent ad9b458c74
commit 16bfbb78ca
No known key found for this signature in database
GPG Key ID: F941078878347C0C
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/Contacts/ContactsMenu/ContactsStore.php
View File

@ -155,7 +155,13 @@ class ContactsStore implements IContactsStore {
} }
if ($ownGroupsOnly && $entry->getProperty('isLocalSystemBook') === true) { if ($ownGroupsOnly && $entry->getProperty('isLocalSystemBook') === true) {
$contactGroups = $this->groupManager->getUserGroupIds($this->userManager->get($entry->getProperty('UID'))); $uid = $this->userManager->get($entry->getProperty('UID'));
if ($uid === NULL) {
return false;
}
$contactGroups = $this->groupManager->getUserGroupIds($uid);
if (count(array_intersect($contactGroups, $selfGroups)) === 0) { if (count(array_intersect($contactGroups, $selfGroups)) === 0) {
// no groups in common, so shouldn't see the contact // no groups in common, so shouldn't see the contact
return false; return false;