Changeset 1424 in subversion for trunk/roundcubemail/program/include/main.inc

Timestamp:

May 26, 2008 6:11:19 AM (5 years ago)

Author:

till

Message:

fix to #1485083

File:

• trunk/roundcubemail/program/include/main.inc (modified) (1 diff)

trunk/roundcubemail/program/include/main.inc

@@ -280 +280 @@
     {
     $aliases['GB2312'] = 'GB18030';
-    return iconv(($aliases[$from] ? $aliases[$from] : $from), ($aliases[$to] ? $aliases[$to] : $to) . "//IGNORE", $str);
+    $_iconv = iconv(($aliases[$from] ? $aliases[$from] : $from), ($aliases[$to] ? $aliases[$to] : $to) . "//IGNORE", $str);
+    if ($_iconv !== false)
+      {
+        return $_iconv;
+      }
     }