aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMarco Cirillo <maranda@lightwitch.org>2013-04-05 04:49:32 +0000
committerMarco Cirillo <maranda@lightwitch.org>2013-04-05 04:49:32 +0000
commitdf0670d5519feee69981499fdabf14e6727e5c71 (patch)
treec7ed5ad7d99361eb23f51544feee4e263c75c6a2 /prosody
parentd6f7def73cfade7d179a6eb6f3d53229d0ef741a (diff)
downloadprosody-df0670d5519feee69981499fdabf14e6727e5c71.tar.gz
prosody-df0670d5519feee69981499fdabf14e6727e5c71.zip
prosody: load rostermanager after usermanager during environment initialization.
Diffstat (limited to 'prosody')
-rwxr-xr-xprosody2
1 files changed, 1 insertions, 1 deletions
diff --git a/prosody b/prosody
index 875140de..9a88eac0 100755
--- a/prosody
+++ b/prosody
@@ -290,12 +290,12 @@ function load_secondary_libraries()
--- Load and initialise core modules
require "util.import"
require "util.xmppstream"
- require "core.rostermanager"
require "core.stanza_router"
require "core.hostmanager"
require "core.portmanager"
require "core.modulemanager"
require "core.usermanager"
+ require "core.rostermanager"
require "core.sessionmanager"
package.loaded['core.componentmanager'] = setmetatable({},{__index=function()
log("warn", "componentmanager is deprecated: %s", debug.traceback():match("\n[^\n]*\n[ \t]*([^\n]*)"));