diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-04-12 07:27:59 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-04-12 07:27:59 +0000 |
| commit | 437bfd063bd535a998cc03660e4d22485d3ee82a (patch) | |
| tree | c4c38594f9d85374e14e3a02b5307239411d130f /roundcubemail/program/steps/mail | |
| parent | a5cbfb5bb2ab2c5e23bdb5d5750414869357f16b (diff) | |
Don't decode recipent strings submitted by address book
git-svn-id: https://svn.roundcube.net/trunk@4645 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/mail')
| -rw-r--r-- | roundcubemail/program/steps/mail/compose.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/roundcubemail/program/steps/mail/compose.inc b/roundcubemail/program/steps/mail/compose.inc index 0a949949f..3f2390491 100644 --- a/roundcubemail/program/steps/mail/compose.inc +++ b/roundcubemail/program/steps/mail/compose.inc @@ -312,12 +312,14 @@ $parts = array('to', 'cc', 'bcc', 'replyto', 'followupto'); foreach ($parts as $header) { $fvalue = ''; + $decode_header = true; // we have a set of recipients stored is session if ($header == 'to' && ($mailto_id = $_SESSION['compose']['param']['mailto']) && $_SESSION['mailto'][$mailto_id] ) { $fvalue = urldecode($_SESSION['mailto'][$mailto_id]); + $decode_header = false; } else if (!empty($_POST['_'.$header])) { $fvalue = get_input_value('_'.$header, RCUBE_INPUT_POST, TRUE); @@ -371,7 +373,7 @@ foreach ($parts as $header) { // split recipients and put them back together in a unique way if (!empty($fvalue) && in_array($header, array('to', 'cc', 'bcc'))) { - $to_addresses = $IMAP->decode_address_list($fvalue); + $to_addresses = $IMAP->decode_address_list($fvalue, null, $decode_header); $fvalue = array(); foreach ($to_addresses as $addr_part) { |