aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-12-20 14:49:50 +0100
committerKim Alvefur <zash@zash.se>2018-12-20 14:49:50 +0100
commit9568a1a941644421edaf8bf57db2d1177853affa (patch)
tree5585523f0723978b54a09189a45ab054c89625d8 /plugins
parent6822f0a4f68136b9e00b88cf51ffb1a641d8b02c (diff)
parent46e97ef82f870f1f425c80d656f0008448c7b7ff (diff)
downloadprosody-9568a1a941644421edaf8bf57db2d1177853affa.tar.gz
prosody-9568a1a941644421edaf8bf57db2d1177853affa.zip
Merge 0.11->trunk
Diffstat (limited to 'plugins')
-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 4eadc414..bb79cda6 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -1247,7 +1247,7 @@ function room_mt:set_affiliation(actor, jid, affiliation, reason, data)
else
local actor_affiliation = self:get_affiliation(actor);
if actor_affiliation == "owner" then
- if jid_bare(actor) == jid then -- self change
+ if jid_bare(actor) == jid and is_downgrade then -- self change
-- need at least one owner
local is_last = true;
for j in self:each_affiliation("owner") do