From: stekkel <stekkel@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Fri, 30 May 2003 17:23:56 +0000 (+0000)
Subject: Fixed 2 issues:
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d74481266127089b66cd2bc17a0c5c3f53cbca4e;p=squirrelmail.git

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 &nbsp; => wordwrap stops working;


git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4955 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

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