aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-09-23 00:23:33 +0200
committerKim Alvefur <zash@zash.se>2014-09-23 00:23:33 +0200
commitb58d3248b78bce1bc07575ab1ff2a6f30324fc28 (patch)
treed2e98f022591e298964769aeed1c80a086297c8f /core
parentea8046b81b086c914d70faea3f2d208e6030fe37 (diff)
downloadprosody-b58d3248b78bce1bc07575ab1ff2a6f30324fc28.tar.gz
prosody-b58d3248b78bce1bc07575ab1ff2a6f30324fc28.zip
core.module{manager,api}: Fix for 010b141e91ed (Thanks v1ct0r)
Diffstat (limited to 'core')
-rw-r--r--core/moduleapi.lua4
-rw-r--r--core/modulemanager.lua2
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 = { ["*"] = {} };