summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-09-15 12:15:01 +0000
committeralecpl <alec@alec.pl>2010-09-15 12:15:01 +0000
commitacbf0f5ee09ec7832c2747d98c94091c6dcd0a8a (patch)
tree0c584812d8d1f4a4aa562d64b1592dde0bbb318e /program
parentf8e8af7e7c9f43f63a75db5dfb33479866bd7c48 (diff)
- Fix: iconv doesn't support UTF7-IMAP
Diffstat (limited to 'program')
-rw-r--r--program/include/main.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/include/main.inc b/program/include/main.inc
index e3004d048..095862818 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -205,8 +205,8 @@ function rcube_charset_convert($str, $from, $to=NULL)
if ($from == $to || empty($str) || empty($from))
return $str;
- // convert charset using iconv module
- if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') {
+ // convert charset using iconv module
+ if (function_exists('iconv') && $from != 'UTF7-IMAP' && $to != 'UTF7-IMAP') {
if ($iconv_options === null) {
// ignore characters not available in output charset
$iconv_options = '//IGNORE';