From 1573e796d1b68c29751ffc315f69b006301662c1 Mon Sep 17 00:00:00 2001
From: lkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 30 Apr 2000 19:21:41 +0000
Subject: [PATCH] updated bugs file, changed version number to pre2

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@483 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 BUG                   |  6 ++++--
 functions/strings.php |  2 +-
 src/load_prefs.php    | 21 +++++++++++----------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/BUG b/BUG
index f9270221..103505e1 100644
--- a/BUG
+++ b/BUG
@@ -1,9 +1,11 @@
 Known BUGS to be fixed before 0.4pre2:
--------------------------------------------------------
-  -    Sent and Trash are not set to defaults.
+---------------------TO BE FIXED-----------------------
+
+
 
 -----------------------SQUASHED------------------------
 --Fixed for 0.4pre2--
+(lme)  Sent and Trash are not set to defaults.
 (lme)  Does not delete folders correctly in UW that end in /
 (lme)  In "Sent" folder, "from" is "Unknown Sender"
 
diff --git a/functions/strings.php b/functions/strings.php
index dc85a717..942518b5 100644
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -138,7 +138,7 @@
    }
 
    /* SquirrelMail version number -- DO NOT CHANGE */
-   $version = "0.4pre1";
+   $version = "0.4pre2";
 
 
    function find_mailbox_name ($mailbox) {
diff --git a/src/load_prefs.php b/src/load_prefs.php
index 6d8dcfb6..a30be3be 100644
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -24,6 +24,17 @@
       }
    }
 
+   /** Load the user's sent folder preferences **/
+   $move_to_sent = getPref($data_dir, $username, "move_to_sent");
+   if ($move_to_sent == "")
+      $move_to_sent = $default_move_to_sent;
+
+   /** Load the user's trash folder preferences **/
+   $move_to_trash = getPref($data_dir, $username, "move_to_trash");
+   if ($move_to_trash == "")
+      $move_to_trash = $default_move_to_trash;
+
+
    $folder_prefix = getPref($data_dir, $username, "folder_prefix");
    if ($folder_prefix == "")
       $folder_prefix = $default_folder_prefix;
@@ -41,16 +52,6 @@
 		$sent_folder = $folder_prefix . $sent_folder;
 	else
 		$sent_folder = $new_sent_folder;
-	
-   /** Load the user's sent folder preferences **/
-   $move_to_sent = getPref($data_dir, $username, "move_to_sent");
-   if ($move_to_sent == "")
-      $move_to_sent = $default_move_to_sent;
-
-   /** Load the user's trash folder preferences **/
-   $move_to_trash = getPref($data_dir, $username, "move_to_trash");
-   if ($move_to_trash == "")
-      $move_to_trash = $default_move_to_trash;
 
    $show_num = getPref($data_dir, $username, "show_num");
    if ($show_num == "")
-- 
2.25.1