[Svn] r4178 - trunk/roundcubemail/program/include

trac at roundcube.net trac at roundcube.net
Thu Nov 4 14:05:29 CET 2010


Author: alec
Date: 2010-11-04 08:05:29 -0500 (Thu, 04 Nov 2010)
New Revision: 4178

Modified:
   trunk/roundcubemail/program/include/main.inc
Log:
- Skip conversion when input charset is BINARY


Modified: trunk/roundcubemail/program/include/main.inc
===================================================================
--- trunk/roundcubemail/program/include/main.inc	2010-11-04 12:42:22 UTC (rev 4177)
+++ trunk/roundcubemail/program/include/main.inc	2010-11-04 13:05:29 UTC (rev 4178)
@@ -197,7 +197,7 @@
   static $mbstring_list = null;
   static $convert_warning = false;
   static $conv = null;
-  
+
   $error = false;
 
   $to = empty($to) ? strtoupper(RCMAIL_CHARSET) : rcube_parse_charset($to);
@@ -341,6 +341,9 @@
     '/^X-/',            // X- prefix (e.g. X-ROMAN8 => ROMAN8)
     ), '', $charset);
 
+  if ($charset == 'BINARY')
+    return $charsets[$input] = null;
+
   # Aliases: some of them from HTML5 spec.
   $aliases = array(
     'USASCII'       => 'WINDOWS-1252',

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



More information about the Svn mailing list