aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_mam
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-10-29 02:05:19 +0200
committerKim Alvefur <zash@zash.se>2017-10-29 02:05:19 +0200
commit5618526b318176613e65df2bff62db6fa7bb9520 (patch)
tree0d8a66dad4d8c64d5cfab32c11132b2c0e1ca301 /plugins/mod_mam
parent2455838c48d42e5d60239dcc863bd60df8ba16c3 (diff)
parent97b8c701176a111587239b7927a485c81c9ce0b0 (diff)
downloadprosody-5618526b318176613e65df2bff62db6fa7bb9520.tar.gz
prosody-5618526b318176613e65df2bff62db6fa7bb9520.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_mam')
-rw-r--r--plugins/mod_mam/mamprefs.lib.lua6
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/mod_mam/mamprefs.lib.lua b/plugins/mod_mam/mamprefs.lib.lua
index 72c08886..1e05b9d1 100644
--- a/plugins/mod_mam/mamprefs.lib.lua
+++ b/plugins/mod_mam/mamprefs.lib.lua
@@ -33,9 +33,11 @@ local prefs = module:open_store(archive_store .. "_prefs");
local function get_prefs(user)
local user_sessions = sessions[user];
local user_prefs = user_sessions and user_sessions.archive_prefs
- if not user_prefs and user_sessions then
+ if not user_prefs then
user_prefs = prefs:get(user);
- user_sessions.archive_prefs = user_prefs;
+ if user_sessions then
+ user_sessions.archive_prefs = user_prefs;
+ end
end
return user_prefs or { [false] = global_default_policy };
end