aboutsummaryrefslogtreecommitdiffstats
path: root/core/modulemanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-09-23 01:44:16 +0200
committerKim Alvefur <zash@zash.se>2014-09-23 01:44:16 +0200
commit65159ec12ff29eaf2f7f934f6ebb2ecf6a51f30e (patch)
tree1e63192849a869212df2448f814cb37c91b04fe5 /core/modulemanager.lua
parent77918edaac029ab1fe1c62ffe5a72e0ed0046065 (diff)
parentb58d3248b78bce1bc07575ab1ff2a6f30324fc28 (diff)
downloadprosody-65159ec12ff29eaf2f7f934f6ebb2ecf6a51f30e.tar.gz
prosody-65159ec12ff29eaf2f7f934f6ebb2ecf6a51f30e.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 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 = { ["*"] = {} };