Dereku/snappymail
0
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-10-24 22:25:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2074 from FathiBenNasr/fix/getcontactbyemail-missing-columns

Browse source 
PdoAddressBook: GetContactByEmail() passed the wrong columns
This commit is contained in:
Maarten 2026-10-22 12:59:25 +02:00 • committed by GitHub
commit 9f0e6d946a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
View file

@ -723,14 +723,20 @@ class PdoAddressBook
$aParams[':search_lower'] = array($sLowerSearch, \PDO::PARAM_STR);
}
$oContact = null;
$iIdContact = 0;
// This query selects id_contact only, so it must not be handed to
// getContactsFromPDO(), which unconditionally reads id_contact_str,
// changed, etag and jcard from every row. Look the contact up by id
// instead: GetContactByID() selects those columns, so the Contact it
// returns carries a real etag and changed value rather than 0.
$oStmt = $this->prepareAndExecute($sSql, $aParams);
if ($oStmt) {
$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
if (\is_array($aFetch) && \count($aFetch) && !empty($aFetch[0]['id_contact'])) {
return $this->GetContactByID((int) $aFetch[0]['id_contact']);
}
}
$aContacts = $this->getContactsFromPDO(
$this->prepareAndExecute($sSql, $aParams)
);
return $aContacts ? $aContacts[0] : null;
return null;
}
/**