Added what I've changed to devel CVS. (conf.pl rework, CRAM/DIGEST-MD5, config overri...

[squirrelmail.git] / functions / prefs.php

diff --git a/functions/prefs.php b/functions/prefs.php
index bc534c346e55e33e1200c48d8e34e879e0ee63fe..c37748bd98fb3e70cc00cc4d522a68b67fc1cacf 100644 (file)
--- a/functions/prefs.php
+++ b/functions/prefs.php
@@ -11,13 +11,23 @@
  * $Id$
  */
 
-global $prefs_are_cached, $prefs_cache;
+require_once(SM_PATH . 'functions/global.php');
 
-if ( !session_is_registered('prefs_are_cached') ||
+if (isset($_SESSION['prefs_cache'])) {
+    $prefs_cache = $_SESSION['prefs_cache'];
+}
+if (isset($_SESSION['prefs_are_cached'])) {
+    $prefs_are_cached = $_SESSION['prefs_are_cached'];
+}
+
+$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' ||
-     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();
 }