aboutsummaryrefslogtreecommitdiffstats
path: root/core/modulemanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-05-03 01:11:21 +0100
committerMatthew Wild <mwild1@gmail.com>2009-05-03 01:11:21 +0100
commit67c94f50f4dfd8d3f3de0e84bafb56d37d5cdd83 (patch)
tree7aac7e2c38a5a98eb1c3d84103800a3a9e09e9d9 /core/modulemanager.lua
parent29b41d9efd7e4a84f043b38cfdb51893a4504616 (diff)
parent7be3d9f227ff8083e396497507dbdfe9a6049ca8 (diff)
downloadprosody-67c94f50f4dfd8d3f3de0e84bafb56d37d5cdd83.tar.gz
prosody-67c94f50f4dfd8d3f3de0e84bafb56d37d5cdd83.zip
Merge with 0.4
Diffstat (limited to 'core/modulemanager.lua')
-rw-r--r--core/modulemanager.lua4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index cc48c2f6..2cba50ac 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -53,6 +53,10 @@ local NULL = {};
-- Load modules when a host is activated
function load_modules_for_host(host)
+ if config.get(host, "core", "modules_enable") == false then
+ return; -- Only load for hosts, not components, etc.
+ end
+
-- Load modules from global section
local modules_enabled = config.get("*", "core", "modules_enabled");
local modules_disabled = config.get(host, "core", "modules_disabled");