sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31655 from nextcloud/fix-passing-null-to-strlen 

Fix passing null to strlen
pull/31684/head
Côme Chilliet 2022-03-24 14:03:13 +07:00 committed by GitHub
parent c9ea2363b1 0456f61c1c
commit fbf1334dc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/Contacts/ContactsMenu/ContactsStore.php
Unescape Escape View File

@ -107,7 +107,7 @@ class ContactsStore implements IContactsStore {
}
$allContacts = $this->contactsManager->search(
$filter ?: '',
$filter ?? '',
[
'FN',
'EMAIL'
@ -146,7 +146,7 @@ class ContactsStore implements IContactsStore {
*
* @param IUser $self
* @param Entry[] $entries
* @param string $filter
* @param string|null $filter
* @return Entry[] the filtered contacts
*/
private function filterContacts(

4
lib/private/Contacts/ContactsMenu/Manager.php
Unescape Escape View File

@ -59,14 +59,14 @@ class Manager {
/**
* @param IUser $user
* @param string $filter
* @param string|null $filter
* @return array
*/
public function getEntries(IUser $user, $filter) {
$maxAutocompleteResults = max(0, $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT));
$minSearchStringLength = $this->config->getSystemValueInt('sharing.minSearchStringLength', 0);
$topEntries = [];
if (strlen($filter) >= $minSearchStringLength) {
if (strlen($filter ?? '') >= $minSearchStringLength) {
$entries = $this->store->getContacts($user, $filter, $maxAutocompleteResults);
$sortedEntries = $this->sortEntries($entries);