diff options
author | Matthew Wild <mwild1@gmail.com> | 2014-04-01 16:03:21 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2014-04-01 16:03:21 +0100 |
commit | bf6183e2bbc8dd3f677543cbbe8167138c8a4e29 (patch) | |
tree | c460c2a693857b2b9f6507c685182722c2e640bd | |
parent | c6ca0a459d570285de73061a22889a4fa84096b8 (diff) | |
parent | f701f760d138c413722ab0da17a4db391f08f87e (diff) | |
download | prosody-bf6183e2bbc8dd3f677543cbbe8167138c8a4e29.tar.gz prosody-bf6183e2bbc8dd3f677543cbbe8167138c8a4e29.zip |
Merge0.9.4
-rw-r--r-- | plugins/muc/muc.lib.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index 0dbe81fa..8028f5ae 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -1060,7 +1060,7 @@ function room_mt:can_set_role(actor_jid, occupant_jid, role) 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; |