Software / code / prosody
Changeset
4707:d8fc9a1aabeb
moduleapi: module:depends(): Don't load shared modules onto the current host if the current host is '*'...
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 26 Apr 2012 07:04:59 +0100 |
| parents | 4706:845393c76d17 |
| children | 4708:0e324923ff95 |
| files | core/moduleapi.lua |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/core/moduleapi.lua Thu Apr 26 06:58:57 2012 +0100 +++ b/core/moduleapi.lua Thu Apr 26 07:04:59 2012 +0100 @@ -124,7 +124,8 @@ end); end local mod = modulemanager.get_module(self.host, name) or modulemanager.get_module("*", name); - if mod and mod.module.host == "*" and modulemanager.module_has_method(mod, "add_host") then + if mod and mod.module.host == "*" and self.host ~= "*" + and modulemanager.module_has_method(mod, "add_host") then mod = nil; -- This is a shared module, so we still want to load it on our host end if not mod then
