diff options
| author | Kim Alvefur <zash@zash.se> | 2016-03-19 22:46:41 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-03-19 22:46:41 +0100 |
| commit | 26c655de373d763cae36ccc30bd9af95b44a86a4 (patch) | |
| tree | aaaa5f3bc1025f1c9ba90c3c636e818c534316e7 | |
| parent | 8c0392226672520d8a4a59e7f2544a2d4297d739 (diff) | |
| parent | 14810dd3617d6d780c50b4ee0548b04f329f0173 (diff) | |
| download | prosody-26c655de373d763cae36ccc30bd9af95b44a86a4.tar.gz prosody-26c655de373d763cae36ccc30bd9af95b44a86a4.zip | |
Merge 0.10->trunk
| -rw-r--r-- | core/modulemanager.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua index 65542f9a..7bed1795 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -125,7 +125,9 @@ local function do_load_module(host, module_name, state) end if modulemap[host][module_name] then - log("debug", "%s is already loaded for %s, so not loading again", module_name, host); + if not modulemap["*"][module_name] then + log("debug", "%s is already loaded for %s, so not loading again", module_name, host); + end return nil, "module-already-loaded"; elseif modulemap["*"][module_name] then local mod = modulemap["*"][module_name]; |