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

diff --git a/src/compose.php b/src/compose.php
index c09f97e03ace74c498ae674c2e7e47421f999f26..5852039a1ff40cac40de60a3e55a76bf9d39f94e 100644 (file)
--- 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') {