From 199ff86a842a4a8f7fb12f3b423268b8b33b076d Mon Sep 17 00:00:00 2001 From: stekkel Date: Wed, 8 Feb 2006 17:54:24 +0000 Subject: [PATCH] Incorrect columns were passed through calcfetchColumns with as result the wrong column headers were fetched in case of updating the MSG_HEADERS cache caused by using the prev/next links. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10666 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/read_body.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/read_body.php b/src/read_body.php index 65e74c7c..dd379b2b 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -827,6 +827,7 @@ $aMailbox = sqm_api_mailbox_select($imapConnection, $iAccount, $mailbox,array('s /** * Replace From => To in case it concerns a draft or sent folder */ +$aColumns = array(); if (($mailbox == $sent_folder || $mailbox == $draft_folder) && !in_array(SQM_COL_TO,$index_order)) { $aNewOrder = array(); // nice var name ;) @@ -834,11 +835,12 @@ if (($mailbox == $sent_folder || $mailbox == $draft_folder) && if ($iCol == SQM_COL_FROM) { $iCol = SQM_COL_TO; } - $aNewOrder[] = $iCol; + $aColumns[$iCol] = array(); } - $aColumns = $aNewOrder; } else { - $aColumns = $index_order; + foreach ($index_order as $iCol) { + $aColumns[$iCol] = array(); + } } $aProps = array( @@ -923,8 +925,6 @@ if (isset($passed_ent_id) && $passed_ent_id) { } $header = $message->header; -$header = $message->header; - /****************************************/ /* Block for handling incoming url vars */ -- 2.25.1