# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1527712800 -3600
# Node ID 041ddc670934c79544879b6f5b14206b073d9775
# Parent  9c90cd2fc4c3fadcc27b025818abf992ec392956# Parent  463505cc75d584c5a0b0a735a36d60ec4b18a437
Merge 0.10->trunk

diff -r 9c90cd2fc4c3 -r 041ddc670934 plugins/mod_bosh.lua
diff -r 9c90cd2fc4c3 -r 041ddc670934 plugins/mod_disco.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
diff -r 9c90cd2fc4c3 -r 041ddc670934 plugins/muc/mod_muc.lua
diff -r 9c90cd2fc4c3 -r 041ddc670934 plugins/muc/muc.lib.lua