Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 30 May 2018 21:40:00 +0100
changeset 8846 041ddc670934
parent 8836 9c90cd2fc4c3 (current diff)
parent 8845 463505cc75d5 (diff)
child 8850 74526c425dec
Merge 0.10->trunk
plugins/mod_bosh.lua
plugins/muc/mod_muc.lua
plugins/muc/muc.lib.lua
--- a/plugins/mod_disco.lua	Wed May 30 09:06:17 2018 +0200
+++ b/plugins/mod_disco.lua	Wed May 30 21:40:00 2018 +0100
@@ -154,6 +154,7 @@
 end);
 
 -- Handle disco requests to user accounts
+if module:get_host_type() ~= "local" then	return end -- skip for components
 module:hook("iq/bare/http://jabber.org/protocol/disco#info:query", function(event)
 	local origin, stanza = event.origin, event.stanza;
 	if stanza.attr.type ~= "get" then return; end