Fixing sorting order in get_squirrel_sort() (#1115403).

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

diff --git a/ChangeLog b/ChangeLog
index d593af2aad18f4e1fd53ab0c9b87a235bd589ecf..a135e568af79e9036f63efc03b0f3202fd8a28d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -195,7 +195,7 @@ Version 1.5.1 -- CVS
   - Fixed translations of "On DATE, AUTHOR said" and "AUTHOR said" replies.
   - Added sq_str_pad function for padding of multi-byte strings.
   - Added sq_strlen function for calculation of multi-byte string length.
-  - Quoted "INBOX" in check for the status of INBOX in a LIST call.  Fixes an
+  - Quoted "INBOX" in check for the status of INBOX in a LIST call. Fixes an
     issue with a specific IMAP server.
   - In sqgetGlobalVar(), reset $value if the var is not found in the
     specified location.
@@ -204,6 +204,7 @@ Version 1.5.1 -- CVS
     create an empty one.
   - Add trailing slash for data directory used by global file based address
     book (#1105760).
+  - Fixed sorting problem is get_squirrel_sort() function (#1115403).    
 
 Version 1.5.0
 --------------------

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index cb2cf325c13f5caf35cf41ace1c2ca8ecc032a71..ebf6ad910fcb4d29cc82f3e3d18de4641ad6da4e 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -204,7 +204,7 @@ function get_squirrel_sort($imap_stream, $sSortField, $reverse = false, $aUid =
                  $sPersonal = (isset($addr[SQM_ADDR_PERSONAL]) && $addr[SQM_ADDR_PERSONAL]) ?
                    $addr[SQM_ADDR_PERSONAL] : "";
                  $sEmail = ($addr[SQM_ADDR_HOST]) ?
-                      $addr[SQM_ADDR_HOST] . "@".$addr[SQM_ADDR_HOST] :
+                      $addr[SQM_ADDR_MAILBOX] . "@".$addr[SQM_ADDR_HOST] :
                       $addr[SQM_ADDR_HOST];
                  $v[$f] = ($sPersonal) ? decodeHeader($sPersonal):$sEmail;'),$sSortField);
             $walk = true;