Software / code / prosody
Changeset
9614:7d1dbacda48a
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 09 Nov 2018 23:15:37 +0100 |
| parents | 9610:ca000dcd4c06 (current diff) 9613:4d7b925652d9 (diff) |
| children | 9615:66c6edf56397 |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/net/http.lua Wed Nov 07 21:53:40 2018 +0100 +++ b/net/http.lua Fri Nov 09 23:15:37 2018 +0100 @@ -24,7 +24,6 @@ tonumber, tostring, debug.traceback; local xpcall = require "util.xpcall".xpcall; local error = error -local setmetatable = setmetatable; local log = require "util.logger".init("http"); @@ -273,7 +272,12 @@ options = options; request = request; new = options and function (new_options) - return new(setmetatable(new_options, { __index = options })); + local final_options = {}; + for k, v in pairs(options) do final_options[k] = v; end + if new_options then + for k, v in pairs(new_options) do final_options[k] = v; end + end + return new(final_options); end or new; events = events.new(); };
--- a/plugins/muc/muc.lib.lua Wed Nov 07 21:53:40 2018 +0100 +++ b/plugins/muc/muc.lib.lua Fri Nov 09 23:15:37 2018 +0100 @@ -969,8 +969,8 @@ -- 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 - or self:get_members_only() and self:get_whois() == "anyone" and affiliation_rank >= valid_affiliations.member then + if (affiliation_rank >= valid_affiliations.admin and affiliation_rank >= _aff_rank) + or (self:get_whois() == "anyone") then local reply = st.reply(stanza):query("http://jabber.org/protocol/muc#admin"); for jid in self:each_affiliation(_aff or "none") do local nick = self:get_registered_nick(jid);
