aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2020-02-13 14:27:42 +0000
committerMatthew Wild <mwild1@gmail.com>2020-02-13 14:27:42 +0000
commita1a769e526c4c4ee88b421c003adfdad8a89c01f (patch)
tree81289020f0465ba7459fa8463b2610947ae2a8c6
parent428e4fa83263db49891c64389ba404d819902cb1 (diff)
parentccc5516646c302d2f749e22ac674a296c30ddd3b (diff)
downloadprosody-a1a769e526c4c4ee88b421c003adfdad8a89c01f.tar.gz
prosody-a1a769e526c4c4ee88b421c003adfdad8a89c01f.zip
Merge 0.11->trunk
-rw-r--r--plugins/muc/mod_muc.lua3
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