# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1528467332 -7200
# Node ID cbcac5b9b7ceb0b0061d9b5feae6d8666781b524
# Parent  d4f5d47f874d5d163d4f100fda2d800ed4731aef# Parent  c47f220580fdef2dba7b2c8e4d2c262c949eec18
Merge 0.10->trunk

diff -r d4f5d47f874d -r cbcac5b9b7ce plugins/mod_component.lua
--- a/plugins/mod_component.lua	Fri Jun 08 15:27:13 2018 +0200
+++ b/plugins/mod_component.lua	Fri Jun 08 16:15:32 2018 +0200
@@ -119,9 +119,10 @@
 				if query.name == "query" and query.attr.xmlns == "http://jabber.org/protocol/disco#info" and (not node or node == "") then
 					local name = module:get_option_string("name");
 					if name then
-						event.origin.send(st.reply(stanza):tag("query", { xmlns = "http://jabber.org/protocol/disco#info" })
-							:tag("identity", { category = "component", type = "generic", name = module:get_option_string("name", "Prosody") })):up()
-							:tag("feature", { var = "http://jabber.org/protocol/disco#info" }):up()
+						local reply = st.reply(stanza):tag("query", { xmlns = "http://jabber.org/protocol/disco#info" })
+							:tag("identity", { category = "component", type = "generic", name = module:get_option_string("name", "Prosody") }):up()
+							:tag("feature", { var = "http://jabber.org/protocol/disco#info" }):up();
+						event.origin.send(reply);
 						return true;
 					end
 				end
diff -r d4f5d47f874d -r cbcac5b9b7ce plugins/muc/muc.lib.lua
--- a/plugins/muc/muc.lib.lua	Fri Jun 08 15:27:13 2018 +0200
+++ b/plugins/muc/muc.lib.lua	Fri Jun 08 16:15:32 2018 +0200
@@ -353,11 +353,7 @@
 end);
 
 function room_mt:get_disco_items(stanza)
-	local reply = st.reply(stanza):query("http://jabber.org/protocol/disco#items");
-	for room_jid in self:each_occupant() do
-		reply:tag("item", {jid = room_jid, name = room_jid:match("/(.*)")}):up();
-	end
-	return reply;
+	return st.reply(stanza):query("http://jabber.org/protocol/disco#items");
 end
 
 function room_mt:handle_kickable(origin, stanza) -- luacheck: ignore 212