Software / code / prosody
Diff
core/modulemanager.lua @ 675:cc82394fea22
Automated merge with http://waqas.ath.cx:8000/
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 07 Jan 2009 15:14:24 +0000 |
| parent | 674:4f506c627b49 |
| parent | 672:7db1044d2fab |
| child | 686:13ed38531f69 |
line wrap: on
line diff
--- a/core/modulemanager.lua Wed Jan 07 20:03:59 2009 +0500 +++ b/core/modulemanager.lua Wed Jan 07 15:14:24 2009 +0000 @@ -80,7 +80,9 @@ 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
