diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-09-30 11:06:02 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-09-30 11:06:02 +0100 |
commit | 3525d3e37048d7fe2444347439d81d1484f0ad1a (patch) | |
tree | 611e12d618886f72c74ec6081cc4f3f236319ee4 /core/hostmanager.lua | |
parent | ba09a2a2b6a57e733261d98bff261f6f7718084b (diff) | |
parent | 271afa36733db02b9cace7261a16b8243505bf33 (diff) | |
download | prosody-3525d3e37048d7fe2444347439d81d1484f0ad1a.tar.gz prosody-3525d3e37048d7fe2444347439d81d1484f0ad1a.zip |
Merge with 0.5
Diffstat (limited to 'core/hostmanager.lua')
-rw-r--r-- | core/hostmanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/hostmanager.lua b/core/hostmanager.lua index ba363273..4934e7b2 100644 --- a/core/hostmanager.lua +++ b/core/hostmanager.lua @@ -24,7 +24,7 @@ local function load_enabled_hosts(config) local defined_hosts = config or configmanager.getconfig(); for host, host_config in pairs(defined_hosts) do - if host ~= "*" and (host_config.core.enabled == nil or host_config.core.enabled) then + if host ~= "*" and (host_config.core.enabled == nil or host_config.core.enabled) and not host_config.core.component_module then activate(host, host_config); end end |