소스 검색

updated bugs file, changed version number to pre2

Luke Ehresman 25 년 전
부모
커밋
659198a392
3개의 변경된 파일16개의 추가작업 그리고 13개의 파일을 삭제
  1. 4 2
      BUG
  2. 1 1
      functions/strings.php
  3. 11 10
      src/load_prefs.php

+ 4 - 2
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"
 

+ 1 - 1
functions/strings.php

@@ -138,7 +138,7 @@
    }
 
    /* SquirrelMail version number -- DO NOT CHANGE */
-   $version = "0.4pre1";
+   $version = "0.4pre2";
 
 
    function find_mailbox_name ($mailbox) {

+ 11 - 10
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 == "")