diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-04-21 20:00:30 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-04-21 20:00:30 +0100 |
| commit | 28cb1b2a943e79eebccd1e724585c06e6ffbf420 (patch) | |
| tree | 9e935bda53130f60271915acee8ab86215d637da /core/modulemanager.lua | |
| parent | 40ba334367d45d21d57dea128c429cce1ca874f7 (diff) | |
| download | prosody-28cb1b2a943e79eebccd1e724585c06e6ffbf420.tar.gz prosody-28cb1b2a943e79eebccd1e724585c06e6ffbf420.zip | |
modulemanager: Allow loading a module onto "*" (part-fixes #228)
Diffstat (limited to 'core/modulemanager.lua')
| -rw-r--r-- | core/modulemanager.lua | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua index f9f3a8b8..f00532a0 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -117,13 +117,15 @@ end local function do_load_module(host, module_name) if not (host and module_name) then return nil, "insufficient-parameters"; - elseif not hosts[host] then + elseif not hosts[host] and host ~= "*"then return nil, "unknown-host"; end if not modulemap[host] then modulemap[host] = {}; - hosts[host].modules = modulemap[host]; + if host ~= "*" then + hosts[host].modules = modulemap[host]; + end end if modulemap[host][module_name] then |