aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-10-07 13:36:24 +0200
committerKim Alvefur <zash@zash.se>2020-10-07 13:36:24 +0200
commit0ffb4b893201b9af32dddc03021d2749377b214a (patch)
treeb7db935b461a1b1ba1510553a915ebdc895575d4 /plugins
parenta1bb944f52906a0abc6d1ddee08d84f613cab20d (diff)
parent0e0a75de4e809665f97aabb781503f8be48c8f80 (diff)
downloadprosody-0ffb4b893201b9af32dddc03021d2749377b214a.tar.gz
prosody-0ffb4b893201b9af32dddc03021d2749377b214a.zip
Merge 0.11->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/muc/muc.lib.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 2f72c9eb..6b330131 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -372,12 +372,12 @@ function room_mt:send_occupant_list(to, filter)
end
function room_mt:get_disco_info(stanza)
- local node = stanza.tags[1].attr.node or "";
+ local node = stanza.tags[1].attr.node;
local reply = st.reply(stanza):tag("query", { xmlns = "http://jabber.org/protocol/disco#info", node = node });
local event_name = "muc-disco#info";
local event_data = { room = self, reply = reply, stanza = stanza };
- if node ~= "" then
+ if node and node ~= "" then
event_name = event_name.."/"..node;
else
event_data.form = dataform.new {