From 8878e4d05717c0e0cb4396e374c6c2ca74db6473 Mon Sep 17 00:00:00 2001 From: alec Date: Tue, 8 Nov 2011 11:22:14 +0000 Subject: - Fix so folders with \Noinferiors attribute aren't listed in parent selector - Add LIST result and folder attributes cache - rcmail_render_folder_tree_select(): fix 'exceptions' parameter, add 'skip_noinferiors' option git-svn-id: https://svn.roundcube.net/trunk@5398 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_imap_generic.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'roundcubemail/program/include/rcube_imap_generic.php') diff --git a/roundcubemail/program/include/rcube_imap_generic.php b/roundcubemail/program/include/rcube_imap_generic.php index 5c7a41c73..f200e17ca 100644 --- a/roundcubemail/program/include/rcube_imap_generic.php +++ b/roundcubemail/program/include/rcube_imap_generic.php @@ -2258,13 +2258,11 @@ class rcube_imap_generic } // Add to options array - if (!empty($opts)) { - if (empty($this->data['LIST'][$mailbox])) - $this->data['LIST'][$mailbox] = $opts; - else - $this->data['LIST'][$mailbox] = array_unique(array_merge( - $this->data['LIST'][$mailbox], $opts)); - } + if (empty($this->data['LIST'][$mailbox])) + $this->data['LIST'][$mailbox] = $opts; + else if (!empty($opts)) + $this->data['LIST'][$mailbox] = array_unique(array_merge( + $this->data['LIST'][$mailbox], $opts)); } // * STATUS () else if ($cmd == 'STATUS') { -- cgit v1.2.3