mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-27 09:09:07 +01:00
* eMail: fixed error reported with the user-list: Warning on Felamimail, error array_merge in line 1600
This commit is contained in:
parent
8d45385f5d
commit
350b8f897f
@ -1597,7 +1597,7 @@
|
||||
uasort($autoFolderObjects,array($this,"sortByAutoFolderPos"));
|
||||
}
|
||||
if (is_array($folders)) uasort($folders,array($this,"sortByDisplayName"));
|
||||
$folders2return = array_merge($autoFolderObjects,$folders);
|
||||
//$folders2return = array_merge($autoFolderObjects,$folders);
|
||||
//_debug_array($folders2return); #exit;
|
||||
return array_merge($inboxFolderObject,(array)$autoFolderObjects,(array)$folders);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user