summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2012-04-14 06:28:10 +0000
committeralecpl <alec@alec.pl>2012-04-14 06:28:10 +0000
commit651da7934ed4c13e2cbc2e4a82caf2ebaba87373 (patch)
treed33c1fc3a0fb9d035d165b8d50f28932b0851f5f
parent69baeefab31dda8ffcc43e0636bb93157e2eee4f (diff)
- Fix folder collapsing/expanding broken with framework merge (#1488430)
-rw-r--r--program/include/rcube_ui.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/program/include/rcube_ui.php b/program/include/rcube_ui.php
index 262571047..4e88d8d12 100644
--- a/program/include/rcube_ui.php
+++ b/program/include/rcube_ui.php
@@ -842,7 +842,7 @@ class rcube_ui
foreach ($arrFolders as $key => $folder) {
$title = null;
$folder_class = self::folder_classname($folder['id']);
- $collapsed = strpos($collapsed, '&'.rawurlencode($folder['id']).'&') !== false;
+ $is_collapsed = strpos($collapsed, '&'.rawurlencode($folder['id']).'&') !== false;
$unread = $msgcounts ? intval($msgcounts[$folder['id']]['UNSEEN']) : 0;
if ($folder_class && !$realnames) {
@@ -896,7 +896,7 @@ class rcube_ui
'noclose' => true),
html::a($link_attrib, $html_name) .
(!empty($folder['folders']) ? html::div(array(
- 'class' => ($collapsed ? 'collapsed' : 'expanded'),
+ 'class' => ($is_collapsed ? 'collapsed' : 'expanded'),
'style' => "position:absolute",
'onclick' => sprintf("%s.command('collapse-folder', '%s')", JS_OBJECT_NAME, $js_name)
), '&nbsp;') : ''));
@@ -908,7 +908,7 @@ class rcube_ui
);
if (!empty($folder['folders'])) {
- $out .= html::tag('ul', array('style' => ($collapsed ? "display:none;" : null)),
+ $out .= html::tag('ul', array('style' => ($is_collapsed ? "display:none;" : null)),
self::render_folder_tree_html($folder['folders'], $mbox_name, $jslist, $attrib, $nestLevel+1));
}