diff options
author | Kim Alvefur <zash@zash.se> | 2016-05-28 12:51:12 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-05-28 12:51:12 +0200 |
commit | 0963de2358412e9c7591a1aa7f2ba5ac5aa3df76 (patch) | |
tree | af9b1ce44f8066574de3d39858357fa64c4aa35b /plugins | |
parent | 713422034f373d676d484d3f40fee0667416a25a (diff) | |
parent | 609c8e58a269587412e5aa555d06bc5725a574bc (diff) | |
download | prosody-0963de2358412e9c7591a1aa7f2ba5ac5aa3df76.tar.gz prosody-0963de2358412e9c7591a1aa7f2ba5ac5aa3df76.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/muc/muc.lib.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index baa72a56..3ab9656c 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -872,7 +872,8 @@ function room_mt:handle_admin_query_get_command(origin, stanza) -- You need to be at least an admin, and be requesting info about your affifiliation or lower -- e.g. an admin can't ask for a list of owners local affiliation_rank = valid_affiliations[affiliation or "none"]; - if affiliation_rank >= valid_affiliations.admin and affiliation_rank >= _aff_rank then + if affiliation_rank >= valid_affiliations.admin and affiliation_rank >= _aff_rank + or self:get_members_only() and self:get_whois() == "anyone" and affiliation_rank >= valid_affiliations.member then local reply = st.reply(stanza):query("http://jabber.org/protocol/muc#admin"); for jid in self:each_affiliation(_aff or "none") do reply:tag("item", {affiliation = _aff, jid = jid}):up(); |