projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed warning when attachments aren't set
[squirrelmail.git]
/
functions
/
prefs.php
diff --git
a/functions/prefs.php
b/functions/prefs.php
index 047e1de68d3cbad607e9053553ace507afee0e1a..47e854f2cd72dcb13f1bc7cd680b35812bf1e06b 100644
(file)
--- a/
functions/prefs.php
+++ b/
functions/prefs.php
@@
-3,7
+3,7
@@
/**
* prefs.php
*
/**
* prefs.php
*
- * Copyright (c) 1999-200
2
The SquirrelMail Project Team
+ * Copyright (c) 1999-200
3
The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This contains functions for manipulating user preferences
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This contains functions for manipulating user preferences
@@
-11,21
+11,27
@@
* $Id$
*/
* $Id$
*/
-
global $prefs_are_cached, $prefs_cache
;
+
require_once(SM_PATH . 'functions/global.php')
;
-if ( !session_is_registered('prefs_are_cached') ||
+sqgetGlobalVar('prefs_cache', $prefs_cache, SQ_SESSION );
+sqgetGlobalVar('prefs_are_cached', $prefs_are_cached, SQ_SESSION );
+
+$rg = ini_get('register_globals');
+
+if ( !sqsession_is_registered('prefs_are_cached') ||
!isset( $prefs_cache) ||
!is_array( $prefs_cache) ||
substr( phpversion(), 0, 3 ) == '4.1' ||
!isset( $prefs_cache) ||
!is_array( $prefs_cache) ||
substr( phpversion(), 0, 3 ) == '4.1' ||
- substr( phpversion(), 0, 3 ) == '4.2' ) {
+ substr( phpversion(), 0, 3 ) == '4.2' ||
+ (substr( phpversion(), 0, 3 ) == '4.0' && empty($rg))) {
$prefs_are_cached = false;
$prefs_cache = array();
}
if (isset($prefs_dsn) && !empty($prefs_dsn)) {
$prefs_are_cached = false;
$prefs_cache = array();
}
if (isset($prefs_dsn) && !empty($prefs_dsn)) {
- require_once(
'../
functions/db_prefs.php');
+ require_once(
SM_PATH . '
functions/db_prefs.php');
} else {
} else {
- require_once(
'../
functions/file_prefs.php');
+ require_once(
SM_PATH . '
functions/file_prefs.php');
}
/* Hashing functions */
}
/* Hashing functions */