diff options
| author | Kim Alvefur <zash@zash.se> | 2014-09-23 00:23:33 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-09-23 00:23:33 +0200 |
| commit | ad7e3d7233cff3e34c11323ff5ec64aacb8f678c (patch) | |
| tree | d2e98f022591e298964769aeed1c80a086297c8f /core | |
| parent | 8e74cf8125fdd3cac754f7cdfb4daec62a5a75ea (diff) | |
| download | prosody-ad7e3d7233cff3e34c11323ff5ec64aacb8f678c.tar.gz prosody-ad7e3d7233cff3e34c11323ff5ec64aacb8f678c.zip | |
core.module{manager,api}: Fix for 010b141e91ed (Thanks v1ct0r)
Diffstat (limited to 'core')
| -rw-r--r-- | core/moduleapi.lua | 4 | ||||
| -rw-r--r-- | core/modulemanager.lua | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/moduleapi.lua b/core/moduleapi.lua index e5f86b37..c30a8936 100644 --- a/core/moduleapi.lua +++ b/core/moduleapi.lua @@ -370,7 +370,9 @@ function api:open_store(name, type) return require"core.storagemanager".open(self.host, name or self.name, type); end -return function (mm) +function api.init(mm) modulemanager = mm; return api; end + +return api; diff --git a/core/modulemanager.lua b/core/modulemanager.lua index 198e208a..92372ac3 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -37,7 +37,7 @@ local _G = _G; module "modulemanager" -local api = _G.require "core.moduleapi"(_M); -- Module API container +local api = _G.require "core.moduleapi".init(_M); -- Module API container -- [host] = { [module] = module_env } local modulemap = { ["*"] = {} }; |