Changeset f22b543 in github

Timestamp:

Jun 4, 2010 3:05:06 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:

2144f9c

Parents:

f6b2824

Message:

• Fix: don't call FETCH when THREADS returns empty result

File:

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

program/include/rcube_imap.php

@@ -823 +823 @@
 
         // search set is threaded, we need a new one
-        if ($this->search_threads)
+        if ($this->search_threads) {
+            if (empty($this->search_set['tree']))
+                return array();
             $this->search('', $this->search_string, $this->search_charset, $sort_field);
+        }
 
         $msgs = $this->search_set;
@@ -946 +949 @@
     {
         // update search_set if previous data was fetched with disabled threading
-        if (!$this->search_threads)
+        if (!$this->search_threads) {
+            if (empty($this->search_set))
+                return array();
             $this->search('', $this->search_string, $this->search_charset, $sort_field);
+        }
+
+        // empty result
+        if (empty($this->search_set['tree']))
+            return array();
 
         $thread_tree = $this->search_set['tree'];