浏览代码

missed some spots

stekkel 22 年之前
父节点
当前提交
cac30aace3
共有 1 个文件被更改,包括 7 次插入2 次删除
  1. 7 2
      functions/mime.php

+ 7 - 2
functions/mime.php

@@ -552,7 +552,8 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true) {
     if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
     if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
         function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
         function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
         $string = $languages[$squirrelmail_language]['XTRA_CODE']('decodeheader', $string);
         $string = $languages[$squirrelmail_language]['XTRA_CODE']('decodeheader', $string);
-        return $string;
+	// Do we need to return at this point?
+	// return $string;
     }
     }
     $i = 0;
     $i = 0;
     $aString = explode(' ',$string);
     $aString = explode(' ',$string);
@@ -598,7 +599,11 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true) {
         }
         }
         ++$i;
         ++$i;
     }
     }
-    return implode(' ',$aString);
+    if ($htmlsave) {
+	return implode(' ',$aString);
+    } else {
+	return implode (' ',$aString);
+    }
 }
 }
 
 
 /*
 /*