Fix wrong search result on servers without SORT support

12 years ago · 002d1a44e4
parent 3d8eef31c2
commit 002d1a44e4
1 changed files with 2 additions and 2 deletions
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@ -1015,8 +1015,8 @@ class rcube_imap extends rcube_storage
                $a_msg_headers, $this->sort_field, $this->sort_order);

            // only return the requested part of the set
-            $a_msg_headers = array_slice(array_values($a_msg_headers),
-                $from, min($cnt-$to, $this->page_size));
+            $slice_length  = min($this->page_size, $cnt - ($to > $cnt ? $from : $to));
+            $a_msg_headers = array_slice(array_values($a_msg_headers), $from, $slice_length);

            if ($slice) {
                $a_msg_headers = array_slice($a_msg_headers, -$slice, $slice);