Ticket #1484565: roundcube-iconv-fix.patch

include/main.inc

@@ -1062 +1062 @@
   if ($from==$to || $str=='' || empty($from))
     return $str;
 
+  // These make up for most common mis-labellings noted in the wild, and are
+  // harmless
+  if ($from == 'X-UNKNOWN' || $from == 'UNKNOWN-8BIT' || $from == 'X-USER-DEFINED' || $from == 'ISO-8859-1' || $from == 'US-ASCII')
+          $from = 'WINDOWS-1252';
+  if ($from == 'ISO-8859-8-I') $from = 'ISO-8859-8';
+  if ($from == 'GB2312') $from = 'GB18030';
+
   // convert charset using iconv module  
   if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7')
-    return iconv($from, $to . "//IGNORE", $str);
+  {
+        $retstr = iconv($from, $to . "//IGNORE", $str);
+        if (!$retstr) {
+          return iconv('US-ASCII', $to . "//IGNORE", $str);
+        }
+        return $retstr;
+  }
 
   // convert charset using mbstring module  
   if ($MBSTRING)