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

Timestamp:

Jan 13, 2010 7:59:21 AM (3 years ago)

Author:

alec

Message:

• prevent from PHP error when iconv doesn't support IGNORE (#1486375)

File:

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

trunk/roundcubemail/program/include/main.inc

@@ -196 +196 @@
   // convert charset using iconv module  
   if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') {
-    $_iconv = iconv($from, $to . '//IGNORE', $str);
+    $_iconv = @iconv($from, $to . '//IGNORE', $str);
     if ($_iconv !== false) {
         return $_iconv;