Diff

--- a/core/moduleapi.lua	Mon Aug 17 01:58:53 2015 +0200
+++ b/core/moduleapi.lua	Thu Aug 20 13:05:22 2015 +0200
@@ -7,7 +7,6 @@
 --
 
 local config = require "core.configmanager";
-local modulemanager; -- This gets set from modulemanager
 local array = require "util.array";
 local set = require "util.set";
 local it = require "util.iterators";
@@ -147,6 +146,7 @@
 end
 
 function api:depends(name)
+	local modulemanager = require"core.modulemanager";
 	if not self.dependencies then
 		self.dependencies = {};
 		self:hook("module-reloaded", function (event)
@@ -328,6 +328,7 @@
 end
 
 function api:get_host_items(key)
+	local modulemanager = require"core.modulemanager";
 	local result = modulemanager.get_items(key, self.host) or {};
 	return result;
 end
@@ -437,9 +438,4 @@
 	return self:measure_object_event(prosody.events.wrappers, event_name, stat_name);
 end
 
-function api.init(mm)
-	modulemanager = mm;
-	return api;
-end
-
 return api;