X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Foptions.php;h=3e7ddd05b2a5f8a24a225ee07376828e7e9e378d;hp=b0dc93d632adfde946a7fefd1e3dc1f0ad44e87b;hb=8d6369676a333a6a65a174bfb3b9ec9ea5eb8308;hpb=9f5152fc5867168a6c404cf5fc17dd6298f6927d

diff --git a/src/options.php b/src/options.php
index b0dc93d6..3e7ddd05 100644
--- a/src/options.php
+++ b/src/options.php
@@ -12,7 +12,6 @@
     **/
 
    include('../src/validate.php');
-   include('../functions/page_header.php');
    include('../functions/display_messages.php');
    include('../functions/imap.php');
    include('../functions/array.php');
@@ -22,7 +21,6 @@
       $squirrelmail_language = $language;
    }   
 
-   include('../src/load_prefs.php');
    displayPageHeader($color, _("None"));
 
 ?>
@@ -89,6 +87,10 @@
          setPref($data_dir, $username, 'show_html_default', 1);
       else
          removePref($data_dir, $username, 'show_html_default');
+      if (isset($includeselfreplyall))
+         setPref($data_dir, $username, 'include_self_reply_all', 1);
+      else
+         removePref($data_dir, $username, 'include_self_reply_all');
     
       do_hook('options_display_save');
 
@@ -109,8 +111,12 @@
       } else {
          setPref($data_dir, $username, 'move_to_sent', '0');
          setPref($data_dir, $username, 'sent_folder', 'none');
-      } 
-      setPref($data_dir, $username, 'folder_prefix', $folderprefix);
+      }
+      if (isset($folder_prefix)) {
+         setPref($data_dir, $username, 'folder_prefix', $folderprefix);
+      } else {
+         setPref($data_dir, $username, 'folder_prefix', '');
+      }
       setPref($data_dir, $username, 'unseen_notify', $unseennotify);
       setPref($data_dir, $username, 'unseen_type', $unseentype);
       if (isset($collapsefolders))