Minor bugfix to make sure that startMessage is correct on 2nd and further

screens.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@852 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index a7ff68ed6480176f301eace0d86812623c1e5514..3beb51cf62bda48e245769f0ec7581338d24badb 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -280,14 +280,13 @@
       global $folder_prefix, $sent_folder;
       global $imapServerAddress;
       global $index_order, $real_endMessage, $real_startMessage;
-
+      
       // if cache isn't already set, do it now
       if (!session_is_registered("msgs"))
          session_register("msgs");
       if (!session_is_registered("msort"))
          session_register("msort");
 
-
       if ($startMessage + ($show_num - 1) < $numMessages) {
          $endMessage = $startMessage + ($show_num-1);
       } else {
@@ -337,6 +336,7 @@
           $mailbox, $sort, $Message, $More);
 
       $groupNum = $startMessage % ($show_num - 1);
+      $real_startMessage = $startMessage;
       if ($sort == 6) {
          if ($endMessage - $startMessage < $show_num - 1) {
             $endMessage = $endMessage - $startMessage + 1;
@@ -365,7 +365,7 @@
             next($msort);
             $k++;
          } while (isset ($key) && ($k < $i));
-         printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, 0, 0);
+         printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $real_startMessage, 0, 0);
       } else {
          $i = $startMessage;
 
@@ -377,7 +377,7 @@
          } while (isset ($key) && ($k < $i));
 
          do {
-            printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $startMessage, 0, 0);
+            printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $real_startMessage, 0, 0);
             $key = key($msort);
             $t++;
             $i++;