aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/muc/mod_muc.lua
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-07-25 15:49:00 +0100
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-07-25 15:49:00 +0100
commitf03642b6b559976ec8416cfccb62ebc1098ba9a5 (patch)
treec13184e05c8ab2777b1a2cac3df9c174c9b3aa43 /plugins/muc/mod_muc.lua
parentd2d92d933717827460c637421172b410f574e619 (diff)
downloadprosody-f03642b6b559976ec8416cfccb62ebc1098ba9a5.tar.gz
prosody-f03642b6b559976ec8416cfccb62ebc1098ba9a5.zip
mod_muc: Fix a traceback when an owner joins a room
Diffstat (limited to 'plugins/muc/mod_muc.lua')
-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 03a23e09..29cbd790 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -38,9 +38,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