diff options
Diffstat (limited to 'program/include/main.inc')
| -rw-r--r-- | program/include/main.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/program/include/main.inc b/program/include/main.inc index 921494829..ae7d50b9f 100644 --- a/program/include/main.inc +++ b/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 |