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 | 2688cefaa1c82f82ce2700db8055f9868ca471d1 (patch) | |
| tree | 780d6035d4a4b758b773a8c2aaea79c554184cf5 /plugins/muc/mod_muc.lua | |
| parent | 60930944219fcc8ff4bdb90e56a901a13f21c21d (diff) | |
| parent | f307f2a4a62f2d05b9dd462045a2678b58c0c25d (diff) | |
| download | prosody-2688cefaa1c82f82ce2700db8055f9868ca471d1.tar.gz prosody-2688cefaa1c82f82ce2700db8055f9868ca471d1.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); |