holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix PHP 8.0 TypeError: uasort(): Argument #1 ($array) must be of type array, null given

Browse Source
This commit is contained in:
Ralf Becker 2021-11-05 14:37:21 +01:00
parent 108d077ccd
commit de7f4329ff
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/Mail.php
View File

@ -3067,7 +3067,7 @@ class Mail
$folders = $this->icServer->getMailboxes($path, $_search, true); $folders = $this->icServer->getMailboxes($path, $_search, true);
} }
uasort($folders,array($this,'sortByMailbox'));//ksort($folders); if (is_array($folders)) uasort($folders, array($this,'sortByMailbox'));
} }
elseif(!$_nodePath) // all elseif(!$_nodePath) // all
{ {
@ -3088,7 +3088,7 @@ class Mail
if (self::$debugTimes) $starttime = microtime (true); if (self::$debugTimes) $starttime = microtime (true);
// Merge of all auto folders and specialusefolders // Merge of all auto folders and specialusefolders
$autoFoldersTmp = array_unique((array_merge(self::$autoFolders, array_values(self::$specialUseFolders)))); $autoFoldersTmp = array_unique((array_merge(self::$autoFolders, array_values(self::$specialUseFolders))));
uasort($folders,array($this,'sortByMailbox'));//ksort($folders); if (is_array($folders)) uasort($folders,array($this,'sortByMailbox'));//ksort($folders);
$tmpFolders = $folders; $tmpFolders = $folders;
$inboxFolderObject=$inboxSubFolderObjects=$autoFolderObjects=$typeFolderObject=$mySpecialUseFolders=array(); $inboxFolderObject=$inboxSubFolderObjects=$autoFolderObjects=$typeFolderObject=$mySpecialUseFolders=array();
$googleMailFolderObject=$googleAutoFolderObjects=$googleSubFolderObjects=array(); $googleMailFolderObject=$googleAutoFolderObjects=$googleSubFolderObjects=array();