X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders.php;h=436cb362c3c850b01192e9c9437aec4d6e2cda06;hb=6c1feae608b167bdc3a6d000df9fd2c87873b339;hp=a3acfa8137beb7c5ccbb3249835107863019bbe7;hpb=e54e0b894a77678b16ff712f6b69f782ac9c2916;p=squirrelmail.git

diff --git a/src/folders.php b/src/folders.php
index a3acfa81..436cb362 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -132,7 +132,7 @@
 	      strtolower($boxes[$i]["unformatted"]) != "inbox.trash"))
 	    {
 	       $box = $boxes[$i]["unformatted-dm"];
-	       $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
+	       $box2 = str_replace(' ', ' ', $boxes[$i]["unformatted-disp"]);
 	       echo "         <OPTION VALUE=\"$box\">$box2\n";
 	    }
       }
@@ -159,20 +159,20 @@
    echo "<TT><SELECT NAME=subfolder>\n";
    if (strtolower($imap_server_type) != "courier"){
      if ($default_sub_of_inbox == false)
-       echo '<OPTION SELECTED>[ '._("None")." ]\n";
+       echo '<OPTION SELECTED VALUE="">[ '._("None")." ]\n";
      else
-       echo '<OPTION>[ '._("None")." ]\n";
+       echo '<OPTION VALUE="">[ '._("None")." ]\n";
    }
 
    for ($i = 0; $i < count($boxes); $i++) {
       if (!in_array('noinferiors', $boxes[$i]['flags'])) {
          if ((strtolower($boxes[$i]["unformatted"]) == "inbox") && ($default_sub_of_inbox == true)) {
             $box = $boxes[$i]["unformatted"];
-            $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
+            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
             echo "<OPTION SELECTED VALUE=\"$box\">$box2\n";
          } else {
             $box = $boxes[$i]["unformatted"];
-            $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
+            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
            if (strtolower($imap_server_type) != "courier" ||
                strtolower($box) != "inbox.trash")
              echo "<OPTION VALUE=\"$box\">$box2\n";
@@ -206,7 +206,7 @@
 	     ($boxes[$i]["unformatted"] != $sent_folder)) 
 	    {	
 	       $box = $boxes[$i]["unformatted-dm"];
-	       $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
+	       $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
 	       if (strtolower($imap_server_type) != "courier" || strtolower($box) != "inbox.trash")
 		  echo "<OPTION VALUE=\"$box\">$box2\n";
 	    }
@@ -239,7 +239,7 @@
 	     ($boxes[$i]["unformatted"] != $sent_folder)) 
 	    {	
 	       $box = $boxes[$i]["unformatted-dm"];
-	       $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
+	       $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
 	       echo "         <OPTION VALUE=\"$box\">$box2\n";
 	    }
       }