Merge 0.8->trunk

[prosody.git] / core / modulemanager.lua

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 8928ce140e426a14ea9f1197ce623a98c9ae083c..211b49b631a39729edeff04d881d787d39b9df91 100644 (file)
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -6,8 +6,6 @@
 -- COPYING file in the source package for more information.
 --
 
-local plugin_dir = CFG_PLUGINDIR or "./plugins/";
-
 local logger = require "util.logger";
 local log = logger.init("modulemanager");
 local config = require "core.configmanager";
@@ -39,7 +37,7 @@ end
 
 local array, set = require "util.array", require "util.set";
 
-local autoload_modules = {"presence", "message", "iq"};
+local autoload_modules = {"presence", "message", "iq", "offline"};
 local component_inheritable_modules = {"tls", "dialback", "iq"};
 
 -- We need this to let modules access the real global namespace