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 67a77af65050003f646667bdafeba4cd5a005791..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;
@@ -85,7 +85,6 @@ function load_modules_for_host(host)
        end
 end
 prosody_events.add_handler("host-activated", load_modules_for_host);
-prosody_events.add_handler("component-activated", load_modules_for_host);
 --
 
 function load(host, module_name, config)