aboutsummaryrefslogtreecommitdiffstats
path: root/core/hostmanager.lua
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
commit672f22b6f9036895ba3301bbee91abbe99b180be (patch)
treeaf392dbae3065aa54b4a971eb3c368a74624958d /core/hostmanager.lua
parentedeb5980c3da029e56068a5da524189b40514726 (diff)
parentb6c066f717f02a43f9b506c145302c05294101cc (diff)
downloadprosody-672f22b6f9036895ba3301bbee91abbe99b180be.tar.gz
prosody-672f22b6f9036895ba3301bbee91abbe99b180be.zip
Merge 0.10->trunk
Diffstat (limited to 'core/hostmanager.lua')
-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