diff options
author | Matthew Wild <mwild1@gmail.com> | 2020-02-13 14:27:42 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2020-02-13 14:27:42 +0000 |
commit | d976f08d00fc9c36e43e5356f601f0b14259440d (patch) | |
tree | 81289020f0465ba7459fa8463b2610947ae2a8c6 /plugins | |
parent | e4c3f5d3adef809c3e9c53ec8acb663bc88ac633 (diff) | |
parent | a635489791464475c1df8a462f52e16340543ed0 (diff) | |
download | prosody-d976f08d00fc9c36e43e5356f601f0b14259440d.tar.gz prosody-d976f08d00fc9c36e43e5356f601f0b14259440d.zip |
Merge 0.11->trunk
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/muc/mod_muc.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua index fc39d89f..697b0081 100644 --- a/plugins/muc/mod_muc.lua +++ b/plugins/muc/mod_muc.lua @@ -111,7 +111,8 @@ local function is_admin(jid) return um_is_admin(jid, module.host); end -do -- Monkey patch to make server admins room owners +if module:get_option_boolean("component_admins_as_room_owners", true) then + -- Monkey patch to make server admins room owners local _get_affiliation = room_mt.get_affiliation; function room_mt:get_affiliation(jid) if is_admin(jid) then return "owner"; end |