Changeset 9424cc7 in github

Timestamp:

Nov 15, 2008 10:30:19 AM (5 years ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

193fb42

Parents:

e2e745f

Message:

• fix

File:

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

program/include/rcube_imap.php

@@ -674 +674 @@
       }
     else { // SEARCH searching result, need sorting
-      if ($cnt > $this->pagesize * 2) {
+      $cnt = count($msgs);
+      if ($cnt > 300) { // experimantal best result
         // use memory less expensive (and quick) method for big result set
         $a_index = $this->message_index($mailbox, $this->sort_field, $this->sort_order);
         // get messages uids for one page...
-        $msgs = array_slice(array_keys($a_index), $start_msg, min(count($msgs)-$start_msg, $this->page_size));
+        $msgs = array_slice(array_keys($a_index), $start_msg, min($cnt-$start_msg, $this->page_size));
         // ...and fetch headers
         $this->_fetch_headers($mailbox, join(',', $msgs), $a_msg_headers, NULL);
@@ -704 +705 @@
       
         // only return the requested part of the set
-        return array_slice(array_values($a_msg_headers), $start_msg, min(count($msgs)-$start_msg, $this->page_size));
+        return array_slice(array_values($a_msg_headers), $start_msg, min($cnt-$start_msg, $this->page_size));
         }
       }