X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=include%2Fload_prefs.php;h=a94c0f57be0968d8d6010eb7caf5013a7738e9fd;hb=1c0e847f3c5177b37b9eca2048e4b1afc6766753;hp=f300101c86bceea5e2cdad5a459b3650514f4632;hpb=673f935035f4872437d24a4ce4fabb305dad9696;p=squirrelmail.git

diff --git a/include/load_prefs.php b/include/load_prefs.php
index f300101c..a94c0f57 100644
--- a/include/load_prefs.php
+++ b/include/load_prefs.php
@@ -3,7 +3,7 @@
 /**
  * load_prefs.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Loads preferences from the $username.pref file used by almost
@@ -18,7 +18,9 @@ require_once(SM_PATH . 'functions/prefs.php');
 require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/constants.php');
 
-$username = ( !isset($_SESSION['username']) ? '' : $_SESSION['username'] );
+if( ! sqgetGlobalVar('username', $username, SQ_SESSION) ) {
+    $username = '';
+}
 
 $custom_css = getPref($data_dir, $username, 'custom_css', 'none' );
 
@@ -214,7 +216,6 @@ $enable_forward_as_attachment =
 $show_xmailer_default =
     getPref($data_dir, $username, 'show_xmailer_default', SMPREF_OFF );
 $attachment_common_show_images = getPref($data_dir, $username, 'attachment_common_show_images', SMPREF_OFF );
-$pf_subtle_link = getPref($data_dir, $username, 'pf_subtle_link', SMPREF_ON);
 $pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay', SMPREF_OFF);
 
 /* message disposition notification support setting */