The real nbsp fix, which preserves & too. Spotted by sqm@mynta.org

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

diff --git a/src/download.php b/src/download.php
index 6b6173aa747d639f7ef82a4f2826c9856b0fc126..a021558afc5262d60edefc0a7ef4f0be149a71c4 100644 (file)
--- a/src/download.php
+++ b/src/download.php
@@ -92,7 +92,7 @@ if (is_object($message->header->disposition)) {
     $filename = $header->getParameter('name');
 }
 
-$filename = decodeHeader($filename);
+$filename = decodeHeader($filename, true, false);      //Don't want html output
 if (strlen($filename) < 1) {
     if ($type1 == 'plain' && $type0 == 'text') {
         $suffix = 'txt';
@@ -167,9 +167,9 @@ function DumpHeaders($type0, $type1, $filename, $force) {
             $languages[$squirrelmail_language]['XTRA_CODE']('downloadfilename', $filename, $HTTP_USER_AGENT);
     } else {
 //     $filename = ereg_replace('[^-a-zA-Z0-9\.]', '_', $filename);
-       $filename = ereg_replace('[\\/:\*\?"<>\|;]', '_', str_replace('&nbsp;', ' ', $filename));
+       $filename = ereg_replace('[\\/:\*\?"<>\|;]', '_', $filename);
     }
-
+    // We don't need to care about " since they have been replaced by _
     // A Pox on Microsoft and it's Office!
     if (!$force) {
         // Try to show in browser window