Mercurial > prosody-hg

diff plugins/muc/mod_muc.lua @ 6745:6728ad041761

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 25 Jun 2015 18:57:43 +0200
parents d016437e01bf 79318d548465
children 7816923fd5bf 4caef6d53304
line wrap: on
line diff
--- a/plugins/muc/mod_muc.lua	Thu May 21 22:56:39 2015 +0200
+++ b/plugins/muc/mod_muc.lua	Thu Jun 25 18:57:43 2015 +0200
@@ -39,7 +39,7 @@
 
 	local _set_affiliation = room_mt.set_affiliation;
 	function room_mt:set_affiliation(actor, jid, ...)
-		if is_admin(jid) then return nil, "modify", "not-acceptable"; end
+		if affiliation ~= "owner" and is_admin(jid) then return nil, "modify", "not-acceptable"; end
 		return _set_affiliation(self, actor, jid, ...);
 	end
 end