From 2f7e7b8c4d59ae6c0389bab08eb13a5a9f95557e Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Mon, 4 Sep 2006 12:26:30 +0000
Subject: Little improvements for message parsing and encoding

git-svn-id: https://svn.roundcube.net/trunk@336 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/main.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'roundcubemail/program/include/main.inc')

diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index 921494829..ae7d50b9f 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -842,7 +842,7 @@ function rcube_charset_convert($str, $from, $to=NULL)
   $from = strtoupper($from);
   $to = $to==NULL ? strtoupper($GLOBALS['CHARSET']) : strtoupper($to);
 
-  if ($from==$to || $str=='')
+  if ($from==$to || $str=='' || empty($from))
     return $str;
 
   // convert charset using mbstring module  
-- 
cgit v1.2.3