mod_bosh: Use util.timer for timers instead of server.addtimer.

[prosody.git] / core / modulemanager.lua

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index c78c315b2e8d351f4e066f3501f00be3c72897e5..b12cddf0e858f26d490425964af1c9c7d6a89719 100644 (file)
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -40,7 +40,7 @@ end
 local array, set = require "util.array", require "util.set";
 
 local autoload_modules = {"presence", "message", "iq"};
-local component_inheritable_modules = {"tls", "dialback"};
+local component_inheritable_modules = {"tls", "dialback", "iq"};
 
 -- We need this to let modules access the real global namespace
 local _G = _G;
@@ -117,7 +117,6 @@ function load(host, module_name, config)
 
        local pluginenv = setmetatable({ module = api_instance }, { __index = _G });
        api_instance.environment = pluginenv;
-       pluginenv._M = pluginenv;
        
        setfenv(mod, pluginenv);
        hosts[host].modules = modulemap[host];