* eMail: fixed error reported with the user-list: Warning on Felamimail, error array_merge in line 1600

This commit is contained in:
Klaus Leithoff 2010-12-06 16:20:05 +00:00
parent 8d45385f5d
commit 350b8f897f

View File

@ -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);
}