diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2019-02-23 23:46:08 +0100 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2019-02-23 23:46:08 +0100 |
| commit | 1aeb507114848acc6d37050f03525fa69af43dd2 (patch) | |
| tree | dde0044a5c6a999e656b8c71c18203c619ee6730 | |
| parent | Provide source code filename in *.po, so editors can show the source code (diff) | |
| parent | only destroy rooms if mam is enabled (diff) | |
Merge remote-tracking branch 'processone/pr/2805'
* processone/pr/2805:
only destroy rooms if mam is enabled
| -rw-r--r-- | src/mod_muc_admin.erl | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl index 494a4ef3f..4bb0759eb 100644 --- a/src/mod_muc_admin.erl +++ b/src/mod_muc_admin.erl @@ -840,10 +840,16 @@ decide_room(unused, {_Room_name, _Host, Room_pid}, ServerHost, Last_allowed) -> end; decide_room(empty, {Room_name, Host, _Room_pid}, ServerHost, _Last_allowed) -> case gen_mod:is_loaded(ServerHost, mod_mam) of - true -> - mod_mam:is_empty_for_room(ServerHost, Room_name, Host); - _ -> - false + true -> + Room_options = get_room_options(Room_name, Host), + case lists:keyfind(<<"mam">>, 1, Room_options) of + {<<"mam">>, <<"true">>} -> + mod_mam:is_empty_for_room(ServerHost, Room_name, Host); + _ -> + false + end; + _ -> + false end. seconds_to_days(S) -> |