|
|
@ -197,7 +197,7 @@ function rcube_charset_convert($str, $from, $to=NULL)
|
|
|
|
static $mbstring_list = null;
|
|
|
|
static $mbstring_list = null;
|
|
|
|
static $convert_warning = false;
|
|
|
|
static $convert_warning = false;
|
|
|
|
static $conv = null;
|
|
|
|
static $conv = null;
|
|
|
|
|
|
|
|
|
|
|
|
$error = false;
|
|
|
|
$error = false;
|
|
|
|
|
|
|
|
|
|
|
|
$to = empty($to) ? strtoupper(RCMAIL_CHARSET) : rcube_parse_charset($to);
|
|
|
|
$to = empty($to) ? strtoupper(RCMAIL_CHARSET) : rcube_parse_charset($to);
|
|
|
@ -341,6 +341,9 @@ function rcube_parse_charset($input)
|
|
|
|
'/^X-/', // X- prefix (e.g. X-ROMAN8 => ROMAN8)
|
|
|
|
'/^X-/', // X- prefix (e.g. X-ROMAN8 => ROMAN8)
|
|
|
|
), '', $charset);
|
|
|
|
), '', $charset);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if ($charset == 'BINARY')
|
|
|
|
|
|
|
|
return $charsets[$input] = null;
|
|
|
|
|
|
|
|
|
|
|
|
# Aliases: some of them from HTML5 spec.
|
|
|
|
# Aliases: some of them from HTML5 spec.
|
|
|
|
$aliases = array(
|
|
|
|
$aliases = array(
|
|
|
|
'USASCII' => 'WINDOWS-1252',
|
|
|
|
'USASCII' => 'WINDOWS-1252',
|
|
|
|