jacob.eva
/
ejabberd-contrib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix to work with ejabberd master

This commit is contained in:
Badlop 2013-04-15 12:09:11 +02:00
parent ee7d3c7030
commit 6d7c241a6f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mod_muc_admin/src/mod_muc_admin.erl
View File

@ -171,9 +171,9 @@ muc_online_rooms(ServerHost) ->
fun({_, {Roomname, Host}, _}, Results) -> fun({_, {Roomname, Host}, _}, Results) ->
case MUCHost of case MUCHost of
global -> global ->
[Roomname ++ "@" ++ Host | Results]; [str:join([Roomname, Host], "@") | Results];
Host -> Host ->
[Roomname ++ "@" ++ Host | Results]; [str:join([Roomname, Host], "@") | Results];
_ -> _ ->
Results Results
end end
@ -634,7 +634,7 @@ act_on_room(destroy, {N, H, Pid}, SH) ->
gen_fsm:send_all_state_event( gen_fsm:send_all_state_event(
Pid, {destroy, "Room destroyed by rooms_unused_destroy."}), Pid, {destroy, "Room destroyed by rooms_unused_destroy."}),
mod_muc:room_destroyed(H, N, Pid, SH), mod_muc:room_destroyed(H, N, Pid, SH),
mod_muc:forget_room(H, N); mod_muc:forget_room(SH, H, N);
act_on_room(list, _, _) -> act_on_room(list, _, _) ->
ok. ok.
@ -876,6 +876,8 @@ find_host(global) ->
global; global;
find_host("global") -> find_host("global") ->
global; global;
find_host(ServerHost) when is_list(ServerHost) ->
find_host(list_to_binary(ServerHost));
find_host(ServerHost) -> find_host(ServerHost) ->
gen_mod:get_module_opt_host(ServerHost, mod_muc, "conference.@HOST@"). gen_mod:get_module_opt_host(ServerHost, mod_muc, <<"conference.@HOST@">>).