Changeset 309f49f in github

Timestamp:

Jun 4, 2010 5:58:37 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:

ccf250e

Parents:

ffd3e29

Message:

• performance improvement: skip SEARCH command when mailbox is empty and SEARCH is called just after SELECT

Location:

program/include

Files:

• rcube_imap.php (modified) (1 diff)
• rcube_imap_generic.php (modified) (1 diff)

program/include/rcube_imap.php

@@ -477 +477 @@
             // get message count using SEARCH
             // not very performant but more precise (using UNDELETED)
-            // disable THREADS for this request
-            $threads = $this->threading;
-            $this->threading = false;
-            $index = $this->_search_index($mailbox, $search_str);
-            $this->threading = $threads;
+            $index = $this->conn->search($mailbox, $search_str);
 
             $count = is_array($index) ? count($index) : 0;

program/include/rcube_imap_generic.php

@@ -1585 +1585 @@
     function search($folder, $criteria, $return_uid=false)
     {
+        $old_sel = $this->selected;
+
             if (!$this->select($folder)) {
                 return false;
+            }
+
+        // return empty result when folder is empty and we're just after SELECT
+        if ($old_sel != $folder && !$this->exists) {
+            return array();
             }