mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-09-07 00:17:03 +03:00
This commit is contained in:
parent
19c0c5c98e
commit
56c681bbd5
1 changed files with 4 additions and 2 deletions
|
|
@ -665,8 +665,8 @@ class MailClient
|
||||||
$oMessageCollection->FolderInfo = $oInfo;
|
$oMessageCollection->FolderInfo = $oInfo;
|
||||||
$oMessageCollection->totalEmails = $oInfo->MESSAGES;
|
$oMessageCollection->totalEmails = $oInfo->MESSAGES;
|
||||||
|
|
||||||
$bUseThreads = $oParams->bUseThreads
|
$bUseThreads = $oParams->bUseThreads && $this->oImapClient->CapabilityValue('THREAD');
|
||||||
&& ($this->oImapClient->hasCapability('THREAD=REFS') || $this->oImapClient->hasCapability('THREAD=REFERENCES') || $this->oImapClient->hasCapability('THREAD=ORDEREDSUBJECT'));
|
// && ($this->oImapClient->hasCapability('THREAD=REFS') || $this->oImapClient->hasCapability('THREAD=REFERENCES') || $this->oImapClient->hasCapability('THREAD=ORDEREDSUBJECT'));
|
||||||
if ($oParams->iThreadUid && !$bUseThreads) {
|
if ($oParams->iThreadUid && !$bUseThreads) {
|
||||||
throw new \InvalidArgumentException('THREAD not supported');
|
throw new \InvalidArgumentException('THREAD not supported');
|
||||||
}
|
}
|
||||||
|
|
@ -686,6 +686,8 @@ class MailClient
|
||||||
|
|
||||||
$message_list_limit = $this->oImapClient->Settings->message_list_limit;
|
$message_list_limit = $this->oImapClient->Settings->message_list_limit;
|
||||||
if (0 < $message_list_limit && $message_list_limit < $oInfo->MESSAGES) {
|
if (0 < $message_list_limit && $message_list_limit < $oInfo->MESSAGES) {
|
||||||
|
// if ((0 < $message_list_limit && $message_list_limit < $oInfo->MESSAGES)
|
||||||
|
// || (!$this->oImapClient->hasCapability('SORT') && !$this->oImapClient->CapabilityValue('THREAD'))) {
|
||||||
// Don't use THREAD for speed
|
// Don't use THREAD for speed
|
||||||
$oMessageCollection->Limited = true;
|
$oMessageCollection->Limited = true;
|
||||||
if ($this->oLogger) {
|
if ($this->oLogger) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue