aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-08-17 01:58:53 +0200
committerKim Alvefur <zash@zash.se>2015-08-17 01:58:53 +0200
commita9029bd099734436154fc4e794d3b958e54d1943 (patch)
tree546329968bd3e8772fe0883908259aaad9b8c59e
parentaf5dd482f0ece847376d7d4411806b85f48e996d (diff)
downloadprosody-a9029bd099734436154fc4e794d3b958e54d1943.tar.gz
prosody-a9029bd099734436154fc4e794d3b958e54d1943.zip
MUC: Fix logic error
-rw-r--r--plugins/muc/muc.lib.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 63204d66..deb9ee25 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -1146,7 +1146,7 @@ function room_mt:set_role(actor, occupant_jid, role, reason)
else
-- Can't do anything to other owners or admins
local occupant_affiliation = self:get_affiliation(occupant.bare_jid);
- if occupant_affiliation == "owner" and occupant_affiliation == "admin" then
+ if occupant_affiliation == "owner" or occupant_affiliation == "admin" then
return nil, "cancel", "not-allowed";
end