[Svn] r3010 - in trunk/roundcubemail: . program/include

trac at roundcube.net trac at roundcube.net
Fri Oct 2 20:57:45 CEST 2009


Author: alec
Date: 2009-10-02 13:57:45 -0500 (Fri, 02 Oct 2009)
New Revision: 3010

Modified:
   trunk/roundcubemail/CHANGELOG
   trunk/roundcubemail/program/include/rcube_imap.php
Log:
- Use default_charset for bodies of messages without charset definition (#1486187)


Modified: trunk/roundcubemail/CHANGELOG
===================================================================
--- trunk/roundcubemail/CHANGELOG	2009-10-02 17:12:51 UTC (rev 3009)
+++ trunk/roundcubemail/CHANGELOG	2009-10-02 18:57:45 UTC (rev 3010)
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Use default_charset for bodies of messages without charset definition (#1486187)
 - Password: added cPanel driver
 - Fix return to first page from e-mail screen (#1486105)
 - Fix handling HTML comments in HTML messages (#1486189)

Modified: trunk/roundcubemail/program/include/rcube_imap.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_imap.php	2009-10-02 17:12:51 UTC (rev 3009)
+++ trunk/roundcubemail/program/include/rcube_imap.php	2009-10-02 18:57:45 UTC (rev 3010)
@@ -1554,7 +1554,7 @@
     // convert charset (if text or message part)
     if ($o_part->ctype_primary=='text' || $o_part->ctype_primary=='message') {
       // assume default if no charset specified
-      if (empty($o_part->charset))
+      if (empty($o_part->charset) || strtolower($o_part->charset) == 'us-ascii')
         $o_part->charset = $this->default_charset;
 
       $body = rcube_charset_convert($body, $o_part->charset);

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



More information about the Svn mailing list