From e130b283a7803466eceb1c877b641d4457114de5 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 24 Jun 2017 14:29:07 +0300 Subject: [PATCH] db prefs: ignore cache when preference requested for specified UID (in case cached value of a different profile is stored) prefs: show (and set) enabled plugins for default profile only --- classes/db/prefs.php | 2 +- classes/pref/prefs.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/db/prefs.php b/classes/db/prefs.php index 26562298d..d61cc107b 100644 --- a/classes/db/prefs.php +++ b/classes/db/prefs.php @@ -67,7 +67,7 @@ class Db_Prefs { $user_id = sprintf("%d", $user_id); } - if (isset($this->cache[$pref_name])) { + if (isset($this->cache[$pref_name]) && !$user_id) { $tuple = $this->cache[$pref_name]; return $this->convert($tuple["value"], $tuple["type"]); } diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 0e58a34e2..f003ba027 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -739,7 +739,7 @@ class Pref_Prefs extends Handler_Protected { ".__('Author').""; $system_enabled = array_map("trim", explode(",", PLUGINS)); - $user_enabled = array_map("trim", explode(",", get_pref("_ENABLED_PLUGINS"))); + $user_enabled = array_map("trim", explode(",", get_pref("_ENABLED_PLUGINS", $_SESSION['uid']))); $tmppluginhost = new PluginHost(); $tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"], true); @@ -949,7 +949,7 @@ class Pref_Prefs extends Handler_Protected { else $plugins = ""; - set_pref("_ENABLED_PLUGINS", $plugins); + set_pref("_ENABLED_PLUGINS", $plugins, $_SESSION["uid"]); } function clearplugindata() {