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

Fix mail tree throws xml error when tries to call wizard popup

Browse Source
This commit is contained in:
Hadi Nategh 2016-06-02 12:33:50 +02:00
parent 3011c1f095
commit 9b99ce5339
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mail/inc/class.mail_tree.inc.php
View File

@ -184,15 +184,9 @@ class mail_tree
try
{
// User defined folders based on account
$definedFolders = array(
'Trash' => $this->ui->mail_bo->getTrashFolder(false),
'Templates' => $this->ui->mail_bo->getTemplateFolder(false),
'Drafts' => $this->ui->mail_bo->getDraftFolder(false),
'Sent' => $this->ui->mail_bo->getSentFolder(false),
'Junk' => $this->ui->mail_bo->getJunkFolder(false),
'Outbox' => $this->ui->mail_bo->getOutboxFolder(false),
);
// *** Note: Should not apply any imap transaction, because in case of exception it will stop the
// process of rendering root node
if ($_parent && !self::isAccountNode($_parent)) // Single node loader
{
$nodeInfo = Mail::pathToFolderData($_parent, $hDelimiter);
@ -233,6 +227,16 @@ class mail_tree
//List of folders
$foldersList = $this->ui->mail_bo->getFolderArrays(null, true, $_allInOneGo?0:2,$_subscribedOnly, false);
// User defined folders based on account
$definedFolders = array(
'Trash' => $this->ui->mail_bo->getTrashFolder(false),
'Templates' => $this->ui->mail_bo->getTemplateFolder(false),
'Drafts' => $this->ui->mail_bo->getDraftFolder(false),
'Sent' => $this->ui->mail_bo->getSentFolder(false),
'Junk' => $this->ui->mail_bo->getJunkFolder(false),
'Outbox' => $this->ui->mail_bo->getOutboxFolder(false),
);
foreach ($foldersList as &$folder)
{
$path = $parent = $parts = explode($folder['delimiter'], $folder['MAILBOX']);
@ -505,7 +509,7 @@ class mail_tree
{
if ($account[Tree::ID] == $_profileID)
{
$account = $branches;
array_merge($account , $branches);
}
}
return $tree;