aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-01-07 15:14:24 +0000
committerMatthew Wild <mwild1@gmail.com>2009-01-07 15:14:24 +0000
commit96f91c20ad8e8fd71eee480ca56eacea606ada52 (patch)
treec8ae13fe7daf3b1c0a578a7cb441eebfe5cf3b7d
parent7c24c84226680524cdfc5e43c8fece0ee838ee8f (diff)
parent046e69447ea86916d08d0f834512794a588c6e4a (diff)
downloadprosody-96f91c20ad8e8fd71eee480ca56eacea606ada52.tar.gz
prosody-96f91c20ad8e8fd71eee480ca56eacea606ada52.zip
Automated merge with http://waqas.ath.cx:8000/
-rw-r--r--core/modulemanager.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index f782f174..4d654ae0 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -80,7 +80,9 @@ function load_modules_for_host(host)
local modules_enabled = config.get(host, "core", "modules_enabled");
if modules_enabled then
for _, module in pairs(modules_enabled) do
- load(host, module);
+ if not is_loaded(host, module) then
+ load(host, module);
+ end
end
end
end