Changeset 5398 in subversion for trunk/roundcubemail/program/include/rcube_imap_generic.php

Timestamp:

Nov 8, 2011 6:22:14 AM (19 months ago)

Author:

alec

Message:

• 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

File:

• trunk/roundcubemail/program/include/rcube_imap_generic.php (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_imap_generic.php

@@ -2259 +2259 @@
 
                     // 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>)