diff options
| author | Konstantinos Kallas <konstantinos.kallas@hotmail.com> | 2017-08-22 14:51:21 +0300 |
|---|---|---|
| committer | Konstantinos Kallas <konstantinos.kallas@hotmail.com> | 2017-08-22 14:51:21 +0300 |
| commit | a59ccc6c9ca6ed1cfda2f1e8bfaac8c8a20c71d6 (patch) | |
| tree | 63f60592bc1c010964c0383c1dbf211a065ca637 | |
| parent | Show SANs in list_Certificates (diff) | |
| parent | When creating room, set option to ensure config is set in muc_room table (#1954) (diff) | |
Merge remote-tracking branch 'upstream/master' into lets_encrypt_acme_support
| -rw-r--r-- | src/mod_muc_admin.erl | 3 | ||||
| -rw-r--r-- | src/mod_muc_room.erl | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl index 332c83b55..5197c1b71 100644 --- a/src/mod_muc_admin.erl +++ b/src/mod_muc_admin.erl @@ -536,7 +536,8 @@ prepare_room_info(Room_info) -> %% ok | error %% @doc Create a room immediately with the default options. create_room(Name1, Host1, ServerHost) -> - create_room_with_opts(Name1, Host1, ServerHost, []). + create_room_with_opts(Name1, Host1, ServerHost, []), + change_room_option(Name1, Host1, <<"persistent">>, <<"true">>). create_room_with_opts(Name1, Host1, ServerHost, CustomRoomOpts) -> true = (error /= (Name = jid:nodeprep(Name1))), diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl index 2a1ca6011..fde43694c 100644 --- a/src/mod_muc_room.erl +++ b/src/mod_muc_room.erl @@ -492,7 +492,7 @@ handle_event({destroy, Reason}, _StateName, handle_event(destroy, StateName, StateData) -> ?INFO_MSG("Destroyed MUC room ~s", [jid:encode(StateData#state.jid)]), - handle_event({destroy, undefined}, StateName, StateData); + handle_event({destroy, <<"">>}, StateName, StateData); handle_event({set_affiliations, Affiliations}, StateName, StateData) -> {next_state, StateName, |