fixes sort order when using server-side and $sort=6

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

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 8ae69c3c9c10c8759cd40622718199028e89c740..12cf11a75a4ed689158af7508800235fc7b61b9b 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -104,6 +104,12 @@ function sqimap_get_sort_order ($imap_stream, $sort) {
     if (session_is_registered('server_sort_array')) {
         session_unregister('server_sort_array');
     }
+    if ($sort == 6) {
+        $qty = sqimap_get_num_messages ($imap_stream, $mailbox);
+        $server_sort_array = range(1, $qty);
+        session_register('server_sort_array');
+        return $server_sort_array;
+    }
     $sid = sqimap_session_id();
     $sort_on = array();
     $reverse = 0;
@@ -115,8 +121,7 @@ function sqimap_get_sort_order ($imap_stream, $sort) {
                       2=> 'FROM',
                       3=> 'FROM',
                       4=> 'SUBJECT',
-                      5=> 'SUBJECT',
-                      6=> 'DATE');
+                      5=> 'SUBJECT');
     if ($internal_date_sort == true) {
         $sort_on[0] = 'ARRIVAL';
         $sort_on[1] = 'ARRIVAL';