program/include/main.inc
@@ -195,7 +195,7 @@ // 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; } @@ -322,6 +322,7 @@ 'TIS620' => 'WINDOWS-874', 'ISO88599' => 'WINDOWS-1254', 'ISO885911' => 'WINDOWS-874', 'MACROMAN' => 'MACINTOSH', ); // allow a-z and 0-9 only and remove X- prefix (e.g. X-ROMAN8 => ROMAN8)
