diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-01-18 18:44:58 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-01-18 18:44:58 +0000 |
| commit | a651d9102302e73f181bc3a81ecdae8f9e21b649 (patch) | |
| tree | 780d6035d4a4b758b773a8c2aaea79c554184cf5 /plugins/muc/mod_muc.lua | |
| parent | f240b6bd4dcc33c040ca3913ce54d3d31c4dbf1b (diff) | |
| parent | 1262f0373f70ecdc0f7e39c5ffbe065bc8042ce5 (diff) | |
| download | prosody-a651d9102302e73f181bc3a81ecdae8f9e21b649.tar.gz prosody-a651d9102302e73f181bc3a81ecdae8f9e21b649.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/muc/mod_muc.lua')
| -rw-r--r-- | plugins/muc/mod_muc.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua index 042d3891..7bb1d8b2 100644 --- a/plugins/muc/mod_muc.lua +++ b/plugins/muc/mod_muc.lua @@ -52,8 +52,9 @@ local function is_admin(jid) return um_is_admin(jid, module.host); end -local _set_affiliation = muc_new_room.room_mt.set_affiliation; -local _get_affiliation = muc_new_room.room_mt.get_affiliation; +room_mt = muclib.room_mt; -- Yes, global. +local _set_affiliation = room_mt.set_affiliation; +local _get_affiliation = room_mt.get_affiliation; function muclib.room_mt:get_affiliation(jid) if is_admin(jid) then return "owner"; end return _get_affiliation(self, jid); |