浏览代码

Fixed 2 issues:
1: Removal of preleading space caused by decodeHeader.
2: Changed call to decodeHeader from compose to htmlsafe = false so we do
not see spaces changed to   => wordwrap stops working;

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

+ 1 - 5
functions/mime.php

@@ -547,7 +547,7 @@ function decodeBody($body, $encoding) {
  * Patched by Christian Schmidt <christian@ostenfeld.dk>  23/03/2002
  * Patched by Christian Schmidt <christian@ostenfeld.dk>  23/03/2002
  */
  */
 function decodeHeader ($string, $utfencode=true,$htmlsave=true) {
 function decodeHeader ($string, $utfencode=true,$htmlsave=true) {
-    global $default_charset, $languages, $squirrelmail_language;
+    global $languages, $squirrelmail_language;
     if (is_array($string)) {
     if (is_array($string)) {
         $string = implode("\n", $string);
         $string = implode("\n", $string);
     }
     }
@@ -562,10 +562,6 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true) {
     $iLastMatch = -2;
     $iLastMatch = -2;
     $encoded = false;
     $encoded = false;
 
 
-    if (strtolower($default_charset) == 'iso-8859-1') {
-        $string = str_replace("\240",' ',$string);
-    }
-
     $aString = explode(' ',$string);
     $aString = explode(' ',$string);
     $ret = '';
     $ret = '';
     foreach ($aString as $chunk) {
     foreach ($aString as $chunk) {