[Svn] r2286 - in trunk/roundcubemail: . program/steps/mail

trac at roundcube.net trac at roundcube.net
Tue Feb 10 12:49:29 CET 2009


Author: alec
Date: 2009-02-10 05:49:29 -0600 (Tue, 10 Feb 2009)
New Revision: 2286

Modified:
   trunk/roundcubemail/CHANGELOG
   trunk/roundcubemail/program/steps/mail/func.inc
Log:
- Use default_charset for messages without specified charset (#1485661, #1484961)


Modified: trunk/roundcubemail/CHANGELOG
===================================================================
--- trunk/roundcubemail/CHANGELOG	2009-02-09 18:22:12 UTC (rev 2285)
+++ trunk/roundcubemail/CHANGELOG	2009-02-10 11:49:29 UTC (rev 2286)
@@ -1,6 +1,10 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
+2009/02/10 (alec)
+----------
+- Use default_charset for messages without specified charset (#1485661, #1484961)
+
 2009/02/08 (thomasb)
 ----------
 - Added TNEF support to decode MS Outlook attachments (winmail.dat)

Modified: trunk/roundcubemail/program/steps/mail/func.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/func.inc	2009-02-09 18:22:12 UTC (rev 2285)
+++ trunk/roundcubemail/program/steps/mail/func.inc	2009-02-10 11:49:29 UTC (rev 2286)
@@ -295,8 +295,7 @@
     $out .= sprintf("<td class=\"icon\">%s</td>\n", $message_icon ? sprintf($image_tag, $skin_path, $message_icon, '') : '');
 
 
-    if (!empty($header->charset))
-      $IMAP->set_charset($header->charset);
+    $IMAP->set_charset(!empty($header->charset) ? $header->charset : $CONFIG['default_charset']);
   
     // format each col
     foreach ($a_show_cols as $col)
@@ -404,8 +403,7 @@
     if (empty($header))
       continue;
 
-    if (!empty($header->charset))
-      $IMAP->set_charset($header->charset);
+    $IMAP->set_charset(!empty($header->charset) ? $header->charset : $CONFIG['default_charset']);
 
     // remove 'attachment' and 'flag' columns, we don't need them here
     if(($key = array_search('attachment', $a_show_cols)) !== FALSE)

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



More information about the Svn mailing list