prosody
79318d548465
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 @ 6744:79318d548465

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Thu, 25 Jun 2015 18:54:01 +0200
parent 6000:0f6399c86c10
parent 6743:adf2fdf1264a
child 6745:6728ad041761
child 7266:f0a2a305b788
line wrap: on
line diff
--- a/plugins/muc/mod_muc.lua	Wed Jun 24 23:25:42 2015 +0100
+++ b/plugins/muc/mod_muc.lua	Thu Jun 25 18:54:01 2015 +0200
@@ -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