Stopped using presencemanager in stanza_router

2 files changed, 4 insertions, 6 deletions

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 7d3b50b5..f5a19307 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -24,9 +24,9 @@ local s2s_make_authenticated = require "core.s2smanager".make_authenticated;
 local modules_handle_stanza = require "core.modulemanager".handle_stanza;
 local component_handle_stanza = require "core.componentmanager".handle_stanza;
 
-local handle_outbound_presence_subscriptions_and_probes = require "core.presencemanager".handle_outbound_presence_subscriptions_and_probes;
-local handle_inbound_presence_subscriptions_and_probes = require "core.presencemanager".handle_inbound_presence_subscriptions_and_probes;
-local handle_normal_presence = require "core.presencemanager".handle_normal_presence;
+local handle_outbound_presence_subscriptions_and_probes = function()end;--require "core.presencemanager".handle_outbound_presence_subscriptions_and_probes;
+local handle_inbound_presence_subscriptions_and_probes = function()end;--require "core.presencemanager".handle_inbound_presence_subscriptions_and_probes;
+local handle_normal_presence = function()end;--require "core.presencemanager".handle_normal_presence;
 
 local format = string.format;
 local tostring = tostring;
diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index 0d35feed..7b521c50 100644
--- a/plugins/mod_presence.lua
+++ b/plugins/mod_presence.lua
@@ -243,7 +243,7 @@ local function presence_handler(data)
 		if to == nil and stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error" then

 			handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza);

 		elseif not to then

-			handle_normal_presence(origin, stanza);

+			handle_normal_presence(origin, stanza, core_route_stanza);

 		else

 			core_route_stanza(origin, stanza);

 		end

@@ -263,5 +263,3 @@ add_handler(module:get_host().."/presence", presence_handler);
 module.unload = function()

 	remove_handler(module:get_host().."/presence", presence_handler);

 end

-

-return _M;