aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-07-27 09:38:40 +0100
committerMatthew Wild <mwild1@gmail.com>2015-07-27 09:38:40 +0100
commit1338b18fb4cd898fadce44250a4cc04b0f27aca4 (patch)
tree84d9fd164391a7a10b1cdd92affd6b350fe67992
parent02e80f65d5f2dde0cc51768fb4625f149f349ae9 (diff)
parentf03642b6b559976ec8416cfccb62ebc1098ba9a5 (diff)
downloadprosody-1338b18fb4cd898fadce44250a4cc04b0f27aca4.tar.gz
prosody-1338b18fb4cd898fadce44250a4cc04b0f27aca4.zip
Merge
-rw-r--r--plugins/muc/mod_muc.lua4
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