summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authortill <till@php.net>2008-05-26 10:11:19 +0000
committertill <till@php.net>2008-05-26 10:11:19 +0000
commit3bfab3b99c5098e802b10a1d442c330af3524249 (patch)
treeed28ce2224d1565b68f627145647b89c3cb8c994 /program/include
parent027af30c7ce6d02a12beb9834ef408f1fe8f40ac (diff)
fix to #1485083
Diffstat (limited to 'program/include')
-rw-r--r--program/include/main.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/program/include/main.inc b/program/include/main.inc
index 596079124..a9c8ccbfb 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -279,7 +279,11 @@ function rcube_charset_convert($str, $from, $to=NULL)
if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7')
{
$aliases['GB2312'] = 'GB18030';
- return iconv(($aliases[$from] ? $aliases[$from] : $from), ($aliases[$to] ? $aliases[$to] : $to) . "//IGNORE", $str);
+ $_iconv = iconv(($aliases[$from] ? $aliases[$from] : $from), ($aliases[$to] ? $aliases[$to] : $to) . "//IGNORE", $str);
+ if ($_iconv !== false)
+ {
+ return $_iconv;
+ }
}
// settings for mbstring module (by Tadashi Jokagi)