core.module{manager,api}: Fix for 010b141e91ed (Thanks v1ct0r)

diff --git a/core/moduleapi.lua b/core/moduleapi.lua
index e5f86b377f3995b41b154b1404e649275808bc55..c30a89367c04fc088320b78f4dc33b639a12882e 100644 (file)
--- 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 198e208a6cf23b56b551d6e9af34aa0a10607b4a..92372ac32f2b62f232addb683538d188cfaaeb03 100644 (file)
--- 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 = { ["*"] = {} };