X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions.php;h=3ad2191bb8fd7ff64a382d0b30a2931a16044629;hb=1bfeac817d0ff6d8be16ddc87f1a0103f2298c11;hp=905252176209b3c4e3b8eddb4891d2fdff259bdf;hpb=a13cf2438e11aca61e111ee4ef7715a45ba2069f;p=squirrelmail.git
diff --git a/src/options.php b/src/options.php
index 90525217..3ad2191b 100644
--- a/src/options.php
+++ b/src/options.php
@@ -11,10 +11,10 @@
** $Id$
**/
- include('../src/validate.php');
- include('../functions/display_messages.php');
- include('../functions/imap.php');
- include('../functions/array.php');
+ require_once('../src/validate.php');
+ require_once('../functions/display_messages.php');
+ require_once('../functions/imap.php');
+ require_once('../functions/array.php');
if (isset($language)) {
setcookie('squirrelmail_language', $language, time()+2592000);
@@ -37,19 +37,28 @@
'._("Successfully saved display preferences!").'
';
@@ -111,8 +132,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($folderprefix)) {
+ 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))
@@ -206,4 +231,4 @@
-