Merge
authorMatthew Wild <mwild1@gmail.com>
Mon, 27 Jul 2015 09:38:40 +0100
changeset 6773 cb84731b2dfd
parent 6772 4caef6d53304 (current diff)
parent 6771 7816923fd5bf (diff)
child 6778 22c8deb43daf
Merge
plugins/muc/mod_muc.lua
--- a/plugins/muc/mod_muc.lua	Mon Jul 27 18:34:51 2015 +1000
+++ b/plugins/muc/mod_muc.lua	Mon Jul 27 09:38:40 2015 +0100
@@ -87,9 +87,9 @@
 	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