aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2016-06-14 16:40:46 +0200
committerHolger Weiss <holger@zedat.fu-berlin.de>2016-06-14 16:40:46 +0200
commit26bce5dee326dbd7b02a1fdc8e7d46f1fa030eb7 (patch)
tree19c2da351b70de9713f61470e44c4506661339fb /src
parentRecover ec6c58a which was reverted in 100827e (thanks to Alexey Shchepin) (diff)
mod_mam: Fix "assume_mam_usage: if_enabled"
Diffstat (limited to 'src')
-rw-r--r--src/mod_mam.erl7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mod_mam.erl b/src/mod_mam.erl
index 12b80c45c..fb42224db 100644
--- a/src/mod_mam.erl
+++ b/src/mod_mam.erl
@@ -316,7 +316,12 @@ message_is_archived(false, C2SState, Peer,
(never) -> never
end, never) of
if_enabled ->
- get_prefs(LUser, LServer);
+ case get_prefs(LUser, LServer) of
+ #archive_prefs{} = P ->
+ {ok, P};
+ error ->
+ error
+ end;
on_request ->
Mod = gen_mod:db_mod(LServer, ?MODULE),
cache_tab:lookup(archive_prefs, {LUser, LServer},