diff options
author | alecpl <alec@alec.pl> | 2011-11-08 11:22:14 +0000 |
---|---|---|
committer | alecpl <alec@alec.pl> | 2011-11-08 11:22:14 +0000 |
commit | aa07b2290640061a65c9f90d5f30cfc5d4ada195 (patch) | |
tree | ae52bc09831b5eac9facb0153d50d51b699594a2 /program/include/rcube_imap_generic.php | |
parent | 06744da24100473aa8180cf07ec1970987d2f66b (diff) |
- 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
Diffstat (limited to 'program/include/rcube_imap_generic.php')
-rw-r--r-- | program/include/rcube_imap_generic.php | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php index 5c7a41c73..f200e17ca 100644 --- a/program/include/rcube_imap_generic.php +++ b/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 <mailbox> (<result>) else if ($cmd == 'STATUS') { |