diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-04-02 17:42:22 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-04-02 17:42:22 +0100 |
| commit | 499cb87234e01044440591b90c8eb46e63d1e01a (patch) | |
| tree | 861eaefae2bd906eace48b17e5f6172dca6c8f5c /plugins/muc | |
| parent | c98c0fb432db6ce9c7bbcd433168aa27b36854b8 (diff) | |
| parent | 27b4049481f29dcac2d6093c40ad7e8bf1ea8899 (diff) | |
| download | prosody-499cb87234e01044440591b90c8eb46e63d1e01a.tar.gz prosody-499cb87234e01044440591b90c8eb46e63d1e01a.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/muc')
| -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 d09c768e..8cf8d882 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -1032,7 +1032,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; |