mirror of
https://github.com/the-djmaze/snappymail.git
synced 2025-01-07 15:27:43 +08:00
Bugfix Undefined property: MailSo\Mail\FolderCollection::$capabilities
This commit is contained in:
parent
116fed7284
commit
aa22dc61ca
1 changed files with 4 additions and 8 deletions
|
@ -71,12 +71,6 @@ trait Folders
|
||||||
$aSystemFolders = array();
|
$aSystemFolders = array();
|
||||||
$this->recFoldersTypes($oAccount, $oFolderCollection, $aSystemFolders);
|
$this->recFoldersTypes($oAccount, $oFolderCollection, $aSystemFolders);
|
||||||
|
|
||||||
if (!$this->Config()->Get('imap', 'use_sort', true)) {
|
|
||||||
$oFolderCollection->capabilities = \array_filter($oFolderCollection->capabilities, function($item){
|
|
||||||
return !\preg_match('/^E?SORT/', $item);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($this->Config()->Get('labs', 'autocreate_system_folders', false))
|
if ($this->Config()->Get('labs', 'autocreate_system_folders', false))
|
||||||
{
|
{
|
||||||
$bDoItAgain = false;
|
$bDoItAgain = false;
|
||||||
|
@ -186,8 +180,10 @@ trait Folders
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$aCapabilities = \array_filter($this->MailClient()->Capability(), function($item){
|
$bUseSort = $this->Config()->Get('imap', 'use_sort', true);
|
||||||
return !\preg_match('/^(IMAP|AUTH|LOGIN|SASL)/', $item);
|
$aCapabilities = \array_filter($this->MailClient()->Capability(), function ($item) use ($bUseSort) {
|
||||||
|
return !\preg_match('/^(IMAP|AUTH|LOGIN|SASL)/', $item)
|
||||||
|
&& ($bUseSort || !\preg_match('/^E?SORT/', $item));
|
||||||
});
|
});
|
||||||
if (!$this->Config()->Get('imap', 'use_list_status', true)) {
|
if (!$this->Config()->Get('imap', 'use_list_status', true)) {
|
||||||
$key = \array_search('LIST-STATUS', $aCapabilities);
|
$key = \array_search('LIST-STATUS', $aCapabilities);
|
||||||
|
|
Loading…
Reference in a new issue