aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/muc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-06-25 18:57:43 +0200
committerKim Alvefur <zash@zash.se>2015-06-25 18:57:43 +0200
commit21aa02fd1b769ae89fccfd2cd84756f918e2f152 (patch)
tree1b0aa90c356c8219e4165bd4d5136ea99b34e8f1 /plugins/muc
parent20b57f7f016e907cf3d89793f5c57aaeff0b630f (diff)
parentb460e6d47f28382d21c8914abbd75c1b21b38158 (diff)
downloadprosody-21aa02fd1b769ae89fccfd2cd84756f918e2f152.tar.gz
prosody-21aa02fd1b769ae89fccfd2cd84756f918e2f152.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/muc')
-rw-r--r--plugins/muc/mod_muc.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index db85a73f..03a23e09 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -39,7 +39,7 @@ do -- Monkey patch to make server admins room owners
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