When checking for prefs_are_cached we should retrieve this from the session

the proper way. Closes #995102

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7764 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index 37b8cf2975ca1522f826ee01b62acdb1fe01c5a9..8850355d7d775c67cbeb8fc394ceff310d15083d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -66,6 +66,7 @@ Version 1.5.1 -- CVS
   - Get alternating row colors of addressbook in sync with mailbox list.
   - Give proper error when PEAR DB not found.
   - Remove inappropriate strip_tags() from add-to-addressbook (#968475).
+  - Prefs caching didn't work properly with register_globals off (#995102).
 
 Version 1.5.0
 --------------------

diff --git a/functions/db_prefs.php b/functions/db_prefs.php
index 065080f3d2b23bae51744050fdce06bc4a00ecd6..2e54bed2c22ff9ce5744b73b762d8558dfa2a12b 100644 (file)
--- a/functions/db_prefs.php
+++ b/functions/db_prefs.php
@@ -56,7 +56,9 @@ global $prefs_are_cached, $prefs_cache;
 function cachePrefValues($username) {
     global $prefs_are_cached, $prefs_cache;
 
+    sqgetGlobalVar('prefs_are_cached', $prefs_are_cached, SQ_SESSION );
     if ($prefs_are_cached) {
+        sqgetGlobalVar('prefs_cache', $prefs_cache, SQ_SESSION );
         return;
     }
 

diff --git a/functions/file_prefs.php b/functions/file_prefs.php
index d8a5cc97d82a9422d62f2d14071a26837e7101b9..2cc152d1bcc656ab235b578ee2ec2182d9b11a56 100644 (file)
--- a/functions/file_prefs.php
+++ b/functions/file_prefs.php
@@ -21,7 +21,9 @@ include_once(SM_PATH . 'functions/display_messages.php');
 function cachePrefValues($data_dir, $username) {
     global $prefs_are_cached, $prefs_cache;
 
+    sqgetGlobalVar('prefs_are_cached', $prefs_are_cached, SQ_SESSION );
     if ( isset($prefs_are_cached) && $prefs_are_cached) {
+       sqgetGlobalVar('prefs_cache', $prefs_cache, SQ_SESSION );
         return;
     }
 
@@ -261,3 +263,5 @@ function getSig($data_dir, $username, $number) {
     }
     return $sig;
 }
+
+// vim: et ts=4