updated bugs file, changed version number to pre2

[squirrelmail.git] / src / load_prefs.php

diff --git a/src/load_prefs.php b/src/load_prefs.php
index 6d8dcfb6a628debe63bd7d94ae6a587c14908a62..a30be3bea94b7644a40f7fa9c5593f687228ce4a 100644 (file)
--- 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 == "")