[Svn] r4645 - trunk/roundcubemail/program/steps/mail

trac at roundcube.net trac at roundcube.net
Tue Apr 12 09:28:00 CEST 2011


Author: thomasb
Date: 2011-04-12 02:27:59 -0500 (Tue, 12 Apr 2011)
New Revision: 4645

Modified:
   trunk/roundcubemail/program/steps/mail/compose.inc
Log:
Don't decode recipent strings submitted by address book

Modified: trunk/roundcubemail/program/steps/mail/compose.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/compose.inc	2011-04-11 19:10:21 UTC (rev 4644)
+++ trunk/roundcubemail/program/steps/mail/compose.inc	2011-04-12 07:27:59 UTC (rev 4645)
@@ -312,12 +312,14 @@
 
 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 @@
 
   // 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) {

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list