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 | c503d12f5896df43403730336415d62d76de3c12 (patch) | |
tree | c460c2a693857b2b9f6507c685182722c2e640bd | |
parent | cd38d3134c71aab3ae8b22f0062e6a7d18c642f3 (diff) | |
parent | 882dc829654a71a93eafadd4e6e2ee1eabaa2c8c (diff) | |
download | prosody-c503d12f5896df43403730336415d62d76de3c12.tar.gz prosody-c503d12f5896df43403730336415d62d76de3c12.zip |
Merge
-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; |