Changeset e9a97499 in github

Timestamp:

Nov 18, 2010 9:24:47 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

d2b8840

Parents:

0f9d8ca

Message:

• Add threads() result checking

File:

• program/include/rcube_imap.php (modified) (2 diffs)

program/include/rcube_imap.php

@@ -905 +905 @@
         if (empty($this->icache['threads'])) {
             // get all threads
-            list ($thread_tree, $msg_depth, $has_children) = $this->conn->thread(
-                $mailbox, $this->threading, $this->skip_deleted ? 'UNDELETED' : '');
+            $result = $this->conn->thread($mailbox, $this->threading,
+                $this->skip_deleted ? 'UNDELETED' : '');
 
             // add to internal (fast) cache
             $this->icache['threads'] = array();
-            $this->icache['threads']['tree'] = $thread_tree;
-            $this->icache['threads']['depth'] = $msg_depth;
-            $this->icache['threads']['has_children'] = $has_children;
+            $this->icache['threads']['tree'] = is_array($result) ? $result[0] : array();
+            $this->icache['threads']['depth'] = is_array($result) ? $result[1] : array();
+            $this->icache['threads']['has_children'] = is_array($result) ? $result[2] : array();
         }
 
@@ -1693 +1693 @@
             return $a_messages;
         }
-        
+
         if ($sort_field && $this->get_capability('SORT')) {
             $charset = $charset ? $charset : $this->default_charset;