From 3bfab3b99c5098e802b10a1d442c330af3524249 Mon Sep 17 00:00:00 2001
From: till <till@php.net>
Date: Mon, 26 May 2008 10:11:19 +0000
Subject: fix to #1485083

---
 program/include/main.inc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'program/include')

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)
-- 
cgit v1.2.3