more aggressive prefs caching

2 files changed, 9 insertions, 2 deletions

diff --git a/db-prefs.php b/db-prefs.php
index cf941cebe..7a522d6ad 100644
--- a/db-prefs.php
+++ b/db-prefs.php
@@ -18,7 +18,7 @@
 			@$profile = $_SESSION["profile"];
 		} else {
 			$user_id = sprintf("%d", $user_id);
-			$prefs_cache = false;
+			//$prefs_cache = false;
 		}
 
 		if ($prefs_cache && !defined('DISABLE_SESSIONS') && !SINGLE_USER_MODE) {
@@ -130,7 +130,12 @@
 					$profile_qpart
 					AND owner_uid = " . $_SESSION["uid"]);
 
-			$_SESSION["prefs_cache"] = array();
+			if (!defined('DISABLE_SESSIONS') && !SINGLE_USER_MODE) {
+				if ($user_id = $_SESSION["uid"]) {
+					$_SESSION["prefs_cache"][$pref_name]["type"] = $type_name;
+					$_SESSION["prefs_cache"][$pref_name]["value"] = $value;
+				}
+			}
 
 		}
 	}
diff --git a/functions.php b/functions.php
index 275bc4d8e..40e583765 100644
--- a/functions.php
+++ b/functions.php
@@ -2102,6 +2102,8 @@
 	}
 
 	function login_sequence($link, $mobile = false) {
+		$_SESSION["prefs_cache"] = array();
+
 		if (!SINGLE_USER_MODE) {
 
 			$login_action = $_POST["login_action"];