# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1581604062 0
# Node ID d1bfda983ffe01ec2a26236d31278f837601d6db
# Parent  067ada779ea5226b57d27d8caf973ffb7a9d7257# Parent  85585910d468fc44180e7ec7726d37bb41be880a
Merge 0.11->trunk

diff -r 067ada779ea5 -r d1bfda983ffe plugins/muc/mod_muc.lua
--- a/plugins/muc/mod_muc.lua	Wed Feb 05 22:53:59 2020 +0000
+++ b/plugins/muc/mod_muc.lua	Thu Feb 13 14:27:42 2020 +0000
@@ -111,7 +111,8 @@
 	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