aboutsummaryrefslogtreecommitdiffstats
path: root/core/modulemanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-09-18 02:22:48 +0200
committerKim Alvefur <zash@zash.se>2014-09-18 02:22:48 +0200
commit1324a994958a3d4206640db57b11a7a6d504d83a (patch)
tree361f642064745fd1a6601050e7573062ff65e2ad /core/modulemanager.lua
parent04368a22ef17c788d0a734b594f206a3c25f82fc (diff)
parente9fa1d1db3a14e8b0d989c3c3e983521034ad38c (diff)
downloadprosody-1324a994958a3d4206640db57b11a7a6d504d83a.tar.gz
prosody-1324a994958a3d4206640db57b11a7a6d504d83a.zip
Merge 0.10->trunk
Diffstat (limited to 'core/modulemanager.lua')
-rw-r--r--core/modulemanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index db4c6bd0..198e208a 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -37,7 +37,7 @@ local _G = _G;
module "modulemanager"
-local api = _G.require "core.moduleapi"; -- Module API container
+local api = _G.require "core.moduleapi"(_M); -- Module API container
-- [host] = { [module] = module_env }
local modulemap = { ["*"] = {} };