From 310dfeb632e6227c9e3f3cfe86f8de0ea7fc7bc7 Mon Sep 17 00:00:00 2001 From: stekkel Date: Tue, 1 Jun 2004 22:11:49 +0000 Subject: [PATCH] Rollback some parts of previous update because it contains unfinished work which slipped in. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7582 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/compose.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/compose.php b/src/compose.php index c09f97e0..5852039a 100644 --- a/src/compose.php +++ b/src/compose.php @@ -1369,16 +1369,12 @@ function deliverMessage($composeMessage, $draft=false) { $rfc822_header = $composeMessage->rfc822_header; $abook = addressbook_init(false, true); - /* initialize properties for parseAddress */ - $aAddressProps = array( - 'domain' => $domain, - 'abooklookup' => array(&$abook,'lookup') - ); - $rfc822_header->to = $rfc822_header->parseAddress($send_to,$aAddressProps); - $rfc822_header->cc = $rfc822_header->parseAddress($send_to_cc,$aAddressProps); - $rfc822_header->bcc = $rfc822_header->parseAddress($send_to_bcc,$aAddressProps); + $rfc822_header->to = $rfc822_header->parseAddress($send_to,true, array(), '', $domain, array(&$abook,'lookup')); + $rfc822_header->cc = $rfc822_header->parseAddress($send_to_cc,true,array(), '',$domain, array(&$abook,'lookup')); + $rfc822_header->bcc = $rfc822_header->parseAddress($send_to_bcc,true, array(), '',$domain, array(&$abook,'lookup')); $rfc822_header->priority = $mailprio; $rfc822_header->subject = $subject; + $special_encoding=''; if (strtolower($default_charset) == 'iso-2022-jp') { if (mb_detect_encoding($body) == 'ASCII') { -- 2.25.1