prosody
3cc2bc9c1bff
plugins/muc/mod_muc.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

plugins/muc/mod_muc.lua @ 6752:3cc2bc9c1bff

Merge with 0.10
author Matthew Wild <mwild1@gmail.com>
date Mon, 06 Jul 2015 17:07:05 +0100 (2015-07-06)
parent 6744:79318d548465
child 6745:6728ad041761
child 7266:f0a2a305b788
line wrap: on
line diff
--- a/plugins/muc/mod_muc.lua	Mon Jun 29 13:50:31 2015 +0100
+++ b/plugins/muc/mod_muc.lua	Mon Jul 06 17:07:05 2015 +0100
@@ -60,7 +60,7 @@
 	return _get_affiliation(self, jid);
 end
 function muclib.room_mt:set_affiliation(actor, jid, affiliation, callback, reason)
-	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, affiliation, callback, reason);
 end