Merge 0.9.4
authorMatthew Wild <mwild1@gmail.com>
Tue, 01 Apr 2014 16:03:21 +0100
changeset 6050 5d73412aa1ba
parent 6048 e447601cf13c (current diff)
parent 6049 6d410ffd6e13 (diff)
child 6051 46b4af3cf5ce
Merge
--- a/plugins/muc/muc.lib.lua	Tue Apr 01 15:02:36 2014 +0100
+++ b/plugins/muc/muc.lib.lua	Tue Apr 01 16:03:21 2014 +0100
@@ -1060,7 +1060,7 @@
 	if actor_jid == true then return true; end
 
 	local actor = self._occupants[self._jid_nick[actor_jid]];
-	if actor.role == "moderator" then
+	if actor and actor.role == "moderator" then
 		if occupant.affiliation ~= "owner" and occupant.affiliation ~= "admin" then
 			if actor.affiliation == "owner" or actor.affiliation == "admin" then
 				return true;