Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-18 22:15:20 +02:00
Code Releases Activity

Merge remote-tracking branch 'upstream/master' into lets_encrypt_acme_support

Browse Source
This commit is contained in:
Konstantinos Kallas 2017-08-22 14:51:21 +03:00
commit a59ccc6c9c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mod_muc_admin.erl
View File

@ -536,7 +536,8 @@ prepare_room_info(Room_info) ->
%% ok | error %% ok | error
%% @doc Create a room immediately with the default options. %% @doc Create a room immediately with the default options.
create_room(Name1, Host1, ServerHost) -> 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) -> create_room_with_opts(Name1, Host1, ServerHost, CustomRoomOpts) ->
true = (error /= (Name = jid:nodeprep(Name1))), true = (error /= (Name = jid:nodeprep(Name1))),

2
src/mod_muc_room.erl
View File

@ -492,7 +492,7 @@ handle_event({destroy, Reason}, _StateName,
handle_event(destroy, StateName, StateData) -> handle_event(destroy, StateName, StateData) ->
?INFO_MSG("Destroyed MUC room ~s", ?INFO_MSG("Destroyed MUC room ~s",
[jid:encode(StateData#state.jid)]), [jid:encode(StateData#state.jid)]),
handle_event({destroy, undefined}, StateName, StateData); handle_event({destroy, <<"">>}, StateName, StateData);
handle_event({set_affiliations, Affiliations}, handle_event({set_affiliations, Affiliations},
StateName, StateData) -> StateName, StateData) ->
{next_state, StateName, {next_state, StateName,