- Support 'UNICODE-1-1-UTF-7' alias for UTF-7 encoding (#1485758)

release-0.6
alecpl 16 years ago
parent d519ef8a0a
commit 65d7108190

@ -4,6 +4,7 @@ CHANGELOG RoundCube Webmail
2009/03/01 (alec) 2009/03/01 (alec)
---------- ----------
- Fix attaching more than nine inline images (#1485759) - Fix attaching more than nine inline images (#1485759)
- Support 'UNICODE-1-1-UTF-7' alias for UTF-7 encoding (#1485758)
2009/02/27 (thomasb) 2009/02/27 (thomasb)
---------- ----------

@ -186,6 +186,12 @@ function rcube_charset_convert($str, $from, $to=NULL)
$to = $to==NULL ? strtoupper(RCMAIL_CHARSET) : strtoupper($to); $to = $to==NULL ? strtoupper(RCMAIL_CHARSET) : strtoupper($to);
$error = false; $conv = null; $error = false; $conv = null;
# RFC1642
if ($from == 'UNICODE-1-1-UTF-7')
$from = 'UTF-7';
if ($to == 'UNICODE-1-1-UTF-7')
$to = 'UTF-7';
if ($from==$to || $str=='' || empty($from)) if ($from==$to || $str=='' || empty($from))
return $str; return $str;
@ -209,7 +215,6 @@ function rcube_charset_convert($str, $from, $to=NULL)
} }
} }
if (is_null($mbstring_loaded)) if (is_null($mbstring_loaded))
$mbstring_loaded = extension_loaded('mbstring'); $mbstring_loaded = extension_loaded('mbstring');
@ -233,7 +238,7 @@ function rcube_charset_convert($str, $from, $to=NULL)
} }
} }
# try to convert with custom classes
if (class_exists('utf8')) if (class_exists('utf8'))
$conv = new utf8(); $conv = new utf8();

Loading…
Cancel
Save