diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-01-20 19:35:46 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-01-20 19:35:46 +0300 |
| commit | d5d906184f41232e8ab0b4de1308bfa49a783a61 (patch) | |
| tree | b589bba220001a7cf356a7e8fbf4ccb59480508c /src/ejabberd_admin.erl | |
| parent | Prepare 17.01 for hex.pm (diff) | |
| parent | Fix reporting dialback failures (diff) | |
Merge branch 'new_stream'
Conflicts:
src/cyrsasl.erl
src/ejabberd_c2s.erl
src/ejabberd_cluster.erl
src/ejabberd_frontend_socket.erl
src/ejabberd_node_groups.erl
src/ejabberd_router.erl
src/mod_bosh.erl
src/mod_ip_blacklist.erl
src/mod_muc_mnesia.erl
src/mod_offline.erl
src/mod_proxy65_sm.erl
Diffstat (limited to 'src/ejabberd_admin.erl')
| -rw-r--r-- | src/ejabberd_admin.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl index e70d0a1b..67778e71 100644 --- a/src/ejabberd_admin.erl +++ b/src/ejabberd_admin.erl @@ -414,7 +414,7 @@ send_service_message_all_mucs(Subject, AnnouncementText) -> fun(ServerHost) -> MUCHost = gen_mod:get_module_opt_host( ServerHost, mod_muc, <<"conference.@HOST@">>), - mod_muc:broadcast_service_message(MUCHost, Message) + mod_muc:broadcast_service_message(ServerHost, MUCHost, Message) end, ?MYHOSTS). |