From: stekkel <stekkel@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sat, 1 Mar 2003 22:14:44 +0000 (+0000)
Subject: missed some spots
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d0bcd0ad42857f1db5746aec771b81edfec4b92f;p=squirrelmail.git

missed some spots


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

diff --git a/functions/mime.php b/functions/mime.php
index f8570959..5654520f 100644
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -552,7 +552,8 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true) {
     if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
         function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
         $string = $languages[$squirrelmail_language]['XTRA_CODE']('decodeheader', $string);
-        return $string;
+	// Do we need to return at this point?
+	// return $string;
     }
     $i = 0;
     $aString = explode(' ',$string);
@@ -598,7 +599,11 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true) {
         }
         ++$i;
     }
-    return implode('&nbsp;',$aString);
+    if ($htmlsave) {
+	return implode('&nbsp;',$aString);
+    } else {
+	return implode (' ',$aString);
+    }
 }
 
 /*