prosody, stanza_router: Load stanza_router earlier. Put routing functions in the global prosody table. Fixes module:send()

2 files changed, 4 insertions, 1 deletions

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 50044766..6e8ac6b3 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -204,3 +204,6 @@ function core_route_stanza(origin, stanza)
 		end
 	end
 end
+prosody.core_process_stanza = core_process_stanza;
+prosody.core_post_stanza = core_post_stanza;
+prosody.core_route_stanza = core_route_stanza;
diff --git a/prosody b/prosody
index 64021fd3..52488639 100755
--- a/prosody
+++ b/prosody
@@ -279,12 +279,12 @@ function load_secondary_libraries()
 	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.sessionmanager"
-	require "core.stanza_router"
 	package.loaded['core.componentmanager'] = setmetatable({},{__index=function()
 		log("warn", "componentmanager is deprecated: %s", debug.traceback():match("\n[^\n]*\n[ \t]*([^\n]*)"));
 		return function() end