rollback

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

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index dc103ffce533c92caa54372d2edb34e71d3201dd..b7185e0c5246cd7fe9871e739fd022fa343169cc 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -534,7 +534,7 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs,
                                 $start_msg, $sort, $color, $show_num,
                                 $use_cache, $mode='') {
     global $msgs, $msort, $auto_expunge, $thread_sort_messages,
-           $disable_server_sort, $server_sort_order;
+           $allow_server_sort, $server_sort_order;
 
     /*
      * For some reason, on PHP 4.3+, this being unset, and set in the session causes havoc
@@ -550,10 +550,6 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs,
         $msgs = array();
     }
 
-    if (!isset(disable_server_sort)) {
-        $disable_server_sort = false;
-    }
-
     //$start = microtime();
     /* If autoexpunge is turned on, then do it now. */
     $mbxresponse = sqimap_mailbox_select($imapConnection, $mailbox);
@@ -585,7 +581,7 @@ function showMessagesForMailbox($imapConnection, $mailbox, $num_msgs,
 
         if ($thread_sort_messages == 1) {
             $mode = 'thread';
-        } elseif (sqimap_capabilty($imapConnection,'SORT') && $disable_server_sort != 1) {
+        } elseif ($allow_server_sort == 1) {
             $mode = 'serversort';
         } else {
             $mode = '';