aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/modulemanager.lua7
1 files changed, 6 insertions, 1 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 24fbe3d6..18b511e6 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -70,11 +70,16 @@ function load_modules_for_host(host)
disabled_set[module] = true;
end
end
- for _, module in ipairs(modules_enabled) do
+ for _, module in ipairs({"presence", "message", "iq"}) do
if not disabled_set[module] then
load(host, module);
end
end
+ for _, module in ipairs(modules_enabled) do
+ if not disabled_set[module] and not is_loaded(host, module) then
+ load(host, module);
+ end
+ end
end
-- Load modules from just this host