Another fix for #175

This commit is contained in:
djmaze 2021-12-22 11:38:19 +01:00
parent 0d31261063
commit 11547b575e

View file

@ -1066,25 +1066,16 @@ class MailClient
if (\count($aSearchedUids)) if (\count($aSearchedUids))
{ {
$aFlippedSearchedUids = \array_flip($aSearchedUids);
$bSearch = true;
$aNewUids = array(); $aNewUids = array();
foreach ($aUids as $iUid) foreach ($aUids as $iUid)
{ {
if (isset($aFlippedSearchedUids[$iUid])) if (\in_array($iUid, $aSearchedUids)) {
{
$aNewUids[] = $iUid; $aNewUids[] = $iUid;
} } else if ($bUseThreads && !$oParams->iThreadUid) {
else if ($bUseThreads && !$oParams->iThreadUid && isset($aAllThreads[$iUid]) && \is_array($aAllThreads[$iUid])) foreach ($aAllThreads as $aMap) {
{ if (\in_array($iUid, $aMap) && \array_intersect($aSearchedUids, $aMap)) {
foreach ($aAllThreads[$iUid] as $iSubUid)
{
if (isset($aFlippedSearchedUids[$iSubUid]))
{
$aNewUids[] = $iUid; $aNewUids[] = $iUid;
continue; break;
} }
} }
} }