Changeset 5952 in subversion for branches/release-0.7/program/include/rcube_imap_generic.php

Timestamp:

Mar 3, 2012 8:20:14 AM (15 months ago)

Author:

alec

Message:

• Apply fixes from trunk

File:

• branches/release-0.7/program/include/rcube_imap_generic.php (modified) (1 diff)

branches/release-0.7/program/include/rcube_imap_generic.php

@@ -2280 +2280 @@
                     }
 
-                    // Add to options array
-                    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));
+                    // store LSUB options only if not empty, this way
+                    // we can detect a situation when LIST doesn't return specified folder
+                    if (!empty($opts) || $cmd == 'LIST') {
+                        // Add to options array
+                        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>)