# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1437986320 -3600
# Node ID cb84731b2dfda0ebca7ecf8d0fd04c98156224e8
# Parent  4caef6d5330465d3be67794c4e2ea5c7ee0e7390# Parent  7816923fd5bf680aa29c467274c1a502c7f16c90
Merge

diff -r 4caef6d53304 -r cb84731b2dfd 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