Check for empty default_charset in imap_utf7_decode_local() too. Duplicate code is...

[squirrelmail.git] / functions / imap_utf7_local.php

diff --git a/functions/imap_utf7_local.php b/functions/imap_utf7_local.php
index 5478ea6b35827c5780aed2ad2caa8905ef8f7d3d..c2a9ce8b7f2fb401922e2f9192ebeb46e7d1aefd 100644 (file)
--- a/functions/imap_utf7_local.php
+++ b/functions/imap_utf7_local.php
@@ -91,8 +91,8 @@ function imap_utf7_decode_local($s) {
       return '';
 
     global $default_charset;
-    set_my_charset();
-    if (strtolower($default_charset) != 'iso-8859-1') {
+    set_my_charset();  //must be called before using $default_charset
+    if ((strtolower($default_charset) != 'iso-8859-1') && ($default_charset != '')) {
       $utf7_s = sqimap_mb_convert_encoding($s, $default_charset, 'UTF7-IMAP', $default_charset);
       if ($utf7_s != '')
         return $utf7_s;