diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-07-27 09:38:40 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-07-27 09:38:40 +0100 |
| commit | 26dba92ae79d4ef4b36aeb6e38f9e538e9db8c9a (patch) | |
| tree | 84d9fd164391a7a10b1cdd92affd6b350fe67992 /plugins | |
| parent | 4db4972c83a570cb17f0a7cc61e13f008278d1bd (diff) | |
| parent | 3104c9c125152b50a48ccd08ddb1c6dbeed8c69b (diff) | |
| download | prosody-26dba92ae79d4ef4b36aeb6e38f9e538e9db8c9a.tar.gz prosody-26dba92ae79d4ef4b36aeb6e38f9e538e9db8c9a.zip | |
Merge
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/muc/mod_muc.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua index 81049f35..4331d2ad 100644 --- a/plugins/muc/mod_muc.lua +++ b/plugins/muc/mod_muc.lua @@ -87,9 +87,9 @@ do -- Monkey patch to make server admins room owners end local _set_affiliation = room_mt.set_affiliation; - function room_mt:set_affiliation(actor, jid, ...) + function room_mt:set_affiliation(actor, jid, affiliation, reason) if affiliation ~= "owner" and is_admin(jid) then return nil, "modify", "not-acceptable"; end - return _set_affiliation(self, actor, jid, ...); + return _set_affiliation(self, actor, jid, affiliation, reason); end end |