Fallback to STATUS if LIST-STATUS doesn't work properly

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Base.php b/framework/Imap_Client/lib/Horde/Imap/Client/Base.php
index a07da1d..fc6304c 100644 (file)
--- a/framework/Imap_Client/lib/Horde/Imap/Client/Base.php
+++ b/framework/Imap_Client/lib/Horde/Imap/Client/Base.php
@@ -1122,17 +1122,23 @@ abstract class Horde_Imap_Client_Base
     public function statusMultiple($mailboxes,
                                    $flags = Horde_Imap_Client::STATUS_ALL)
     {
-        $ret = array();
+        $ret = null;
 
         if ($this->queryCapability('LIST-STATUS')) {
             try {
+                $ret = array();
                 foreach ($this->listMailboxes($mailboxes, Horde_Imap_Client::MBOX_ALL, array('status' => $flags)) as $val) {
                     if (isset($val['status'])) {
                         $ret[$val['mailbox']] = $val['status'];
                     }
                 }
-            } catch (Horde_Imap_Client_Exception $e) {}
-        } else {
+            } catch (Horde_Imap_Client_Exception $e) {
+                $ret = null;
+            }
+        }
+
+        if (is_null($ret)) {
+            $ret = array();
             foreach ($mailboxes as $val) {
                 try {
                     $ret[$val] = $this->status($val, $flags);