From b4f6aca62485d80367984be7a141983598114bec Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 10 Mar 2021 20:31:12 +0100 Subject: [PATCH] Clean up the logic of the contacts store a bit Signed-off-by: Joas Schilling --- lib/private/Contacts/ContactsMenu/ContactsStore.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/private/Contacts/ContactsMenu/ContactsStore.php b/lib/private/Contacts/ContactsMenu/ContactsStore.php index e0e0bf832b..69f26c7969 100644 --- a/lib/private/Contacts/ContactsMenu/ContactsStore.php +++ b/lib/private/Contacts/ContactsMenu/ContactsStore.php @@ -165,21 +165,21 @@ class ContactsStore implements IContactsStore { return false; } - $filterUser = true; + $filterOutUser = true; $mailAddresses = $entry->getEMailAddresses(); foreach ($mailAddresses as $mailAddress) { if ($mailAddress === $filter) { - $filterUser = false; + $filterOutUser = false; break; } } if ($entry->getProperty('UID') && $entry->getProperty('UID') === $filter) { - $filterUser = false; + $filterOutUser = false; } - if ($filterUser) { + if ($filterOutUser) { return false; } } elseif ($restrictEnumerationPhone || $restrictEnumerationGroup) { @@ -208,7 +208,7 @@ class ContactsStore implements IContactsStore { if ($ownGroupsOnly && !$checkedCommonGroupAlready) { $user = $this->userManager->get($entry->getProperty('UID')); - if ($user === null) { + if (!$user instanceof IUser) { return false; }