From 204f909c154fd9cbdce76c7391ddceb2c4cef9cc Mon Sep 17 00:00:00 2001 From: tokul Date: Thu, 3 Feb 2005 16:14:30 +0000 Subject: [PATCH] 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 --- ChangeLog | 3 ++- functions/imap_messages.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d593af2a..a135e568 100644 --- 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 cb2cf325..ebf6ad91 100755 --- 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; -- 2.25.1