Software / code / prosody
Changeset
7304:b6adb7c1a645
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 19 Mar 2016 22:46:41 +0100 |
| parents | 7302:92d86016e1e3 (current diff) 7303:439d00063620 (diff) |
| children | 7307:6bbe47e30af4 |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/core/modulemanager.lua Fri Mar 18 14:03:35 2016 +0000 +++ b/core/modulemanager.lua Sat Mar 19 22:46:41 2016 +0100 @@ -125,7 +125,9 @@ 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];
