diff options
author | Christophe Romain <christophe.romain@process-one.net> | 2016-11-25 10:07:04 +0100 |
---|---|---|
committer | Christophe Romain <christophe.romain@process-one.net> | 2016-11-25 10:07:04 +0100 |
commit | 18609befa43c54f90c9e710894469d53caac81d7 (patch) | |
tree | 3cebcb6379209e82eb81e667bd23df12d8f272a2 /src/mod_muc.erl | |
parent | Merge branch 'ukutaht-enable-elixir-in-mix' (diff) | |
parent | Use ejabberd_router:route_error/4 wherever possible (diff) |
Merge branch 'master' of github.com:processone/ejabberd
Diffstat (limited to 'src/mod_muc.erl')
-rw-r--r-- | src/mod_muc.erl | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mod_muc.erl b/src/mod_muc.erl index 554a21704..ab358b957 100644 --- a/src/mod_muc.erl +++ b/src/mod_muc.erl @@ -378,9 +378,8 @@ do_route1(Host, ServerHost, Access, _HistorySize, _RoomShaper, deny -> ErrText = <<"Only service administrators are allowed " "to send service messages">>, - Err = xmpp:make_error( - Packet, xmpp:err_forbidden(ErrText, Lang)), - ejabberd_router:route(To, From, Err) + Err = xmpp:err_forbidden(ErrText, Lang), + ejabberd_router:route_error(To, From, Packet, Err) end end; do_route1(_Host, _ServerHost, _Access, _HistorySize, _RoomShaper, @@ -409,9 +408,8 @@ do_route1(Host, ServerHost, Access, HistorySize, RoomShaper, false -> Lang = xmpp:get_lang(Packet), ErrText = <<"Room creation is denied by service policy">>, - Err = xmpp:make_error( - Packet, xmpp:err_forbidden(ErrText, Lang)), - ejabberd_router:route(To, From, Err) + Err = xmpp:err_forbidden(ErrText, Lang), + ejabberd_router:route_error(To, From, Packet, Err) end; false -> Lang = xmpp:get_lang(Packet), |