defaults in load_prefs are not needed when config-default is populated

but does require running conf.pl again.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1661 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/load_prefs.php b/src/load_prefs.php
index 9e9794eb934bd27260eb36dd75c7aba34d30a9bf..e87fd8339fed6573415675405cf77632838358a3 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -73,9 +73,6 @@
     /** Declare the global variables for the special folders. */
     global $move_to_sent, $move_to_trash, $save_as_draft;
 
-    /** Check the default value for save_to_draft. */
-    if (!isset($default_save_as_draft)) { $default_save_as_draft = true; }
-
     /** Load the user's special folder preferences **/
     $move_to_sent = getPref($data_dir, $username, 'move_to_sent', $default_move_to_sent);
     $move_to_trash = getPref($data_dir, $username, 'move_to_trash', $default_move_to_trash);
@@ -110,7 +107,6 @@
     }
 
     /** Load special folder - draft **/
-    if (!isset($draft_folder)) { $draft_folder = 'none'; }
     $new_draft_folder = getPref($data_dir, $username, 'draft_folder');
     if (($new_draft_folder == '') && ($save_as_draft)) {
         $draft_folder = $folder_prefix . $draft_folder;
@@ -204,4 +200,4 @@
     $hour_format = getPref($data_dir, $username, 'hour_format', 2);
 
     do_hook("loading_prefs");
-?>
\ No newline at end of file
+?>