From 4c75ba81a6d0837bd36b711f22d59b842d9cdc0e Mon Sep 17 00:00:00 2001
From: pallo <pallo@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sat, 10 Mar 2001 22:29:19 +0000
Subject: [PATCH] Merged from stable (sm-1_0) branch: Fixed bug in folder
 creation when language was another than English (folders were created as "[
 None ]/Foldername").

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1192 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 src/folders.php        | 4 ++--
 src/folders_create.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/folders.php b/src/folders.php
index 846220a3..436cb362 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -159,9 +159,9 @@
    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++) {
diff --git a/src/folders_create.php b/src/folders_create.php
index da146046..5e927b12 100644
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -50,7 +50,7 @@
       $subfolder_orig = $subfolder;
    }
 
-   if ((trim($subfolder_orig) == "[ None ]") || (trim($subfolder_orig) == "[ None ]")) {
+   if ((trim($subfolder_orig) == "[ None ]") || (trim($subfolder_orig) == "")) {
       sqimap_mailbox_create ($imapConnection, $folder_prefix.$folder_name, "");
    } else {
       sqimap_mailbox_create ($imapConnection, $subfolder.$dm.$folder_name, "");
-- 
2.25.1