aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-09-21 02:36:28 +0200
committerKim Alvefur <zash@zash.se>2017-09-21 02:36:28 +0200
commit43e5d4df2985e069c52fb21e4636e3e44053d1bf (patch)
treeaf392dbae3065aa54b4a971eb3c368a74624958d /core
parent8cb654ff632fd09ca39941952bd09e2f5d45cecc (diff)
parent1574b7a818dfd40ba2fd5cb3ebf8687ba5a37a4d (diff)
downloadprosody-43e5d4df2985e069c52fb21e4636e3e44053d1bf.tar.gz
prosody-43e5d4df2985e069c52fb21e4636e3e44053d1bf.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
-rw-r--r--core/hostmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index d7a585f9..54944e29 100644
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -91,7 +91,7 @@ function activate(host, host_config)
host_session.type = "component";
end
hosts[host] = host_session;
- if not host:match("[@/]") then
+ if not host_config.disco_hidden and not host:match("[@/]") then
disco_items:set(host:match("%.(.*)") or "*", host, host_config.name or true);
end
for option_name in pairs(host_config) do