From bee933496d167ce842a3b5e7f2506f132affe87c Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Wed, 5 Aug 2015 08:37:22 +0000 Subject: [PATCH] Mail tree phase2 W.I.P.: Make sure node id is string because client-side tree expected to be. Fixes context menu not working after refresh tree --- mail/inc/class.mail_tree.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mail/inc/class.mail_tree.inc.php b/mail/inc/class.mail_tree.inc.php index 5e0c018fdd..8793cde5b5 100644 --- a/mail/inc/class.mail_tree.inc.php +++ b/mail/inc/class.mail_tree.inc.php @@ -271,7 +271,7 @@ class mail_tree if (self::isAccountNode($_parent)) { $tree = array( - tree::ID => $_parent, + tree::ID => (string)$_parent, tree::CHILDREN => $tree[tree::CHILDREN][0][tree::CHILDREN], tree::LABEL => $tree[tree::CHILDREN][0][tree::LABEL], tree::IMAGE_LEAF => $tree[tree::CHILDREN][0][tree::IMAGE_LEAF], @@ -279,6 +279,7 @@ class mail_tree tree::IMAGE_FOLDER_CLOSED => $tree[tree::CHILDREN][0][tree::IMAGE_FOLDER_CLOSED], tree::OPEN => 1, tree::TOOLTIP => $tree[tree::CHILDREN][0][tree::TOOLTIP], + tree::AUTOLOAD_CHILDREN => 1, 'data' => $tree[tree::CHILDREN][0]['data'] ); } @@ -441,7 +442,7 @@ class mail_tree $openActiveAccount = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] == $acc_id?1:0; $baseNode = array( - tree::ID=> $acc_id, + tree::ID=> (string)$acc_id, tree::LABEL => str_replace(array('<','>'),array('[',']'),$identity), tree::TOOLTIP => '('.$acc_id.') '.htmlspecialchars_decode($identity), tree::IMAGE_LEAF => self::$leafImages['folderAccount'],