prosody
d12eb30f7017%3Ad53108635407
Software / code / prosody
Changeset
1012:d53108635407
Automated merge with http://waqas.ath.cx:8000/
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 15 Apr 2009 00:21:40 +0100 |
| parents | 1011:beb039827c9f (diff) 1010:d12eb30f7017 (current diff) |
| children | 1013:943f2cd7e480 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/core/stanza_router.lua Wed Apr 15 00:12:32 2009 +0100 +++ b/core/stanza_router.lua Wed Apr 15 00:21:40 2009 +0100 @@ -24,9 +24,9 @@ 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;
--- a/plugins/mod_presence.lua Wed Apr 15 00:12:32 2009 +0100 +++ b/plugins/mod_presence.lua Wed Apr 15 00:21:40 2009 +0100 @@ -243,7 +243,7 @@ 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 @@ module.unload = function() remove_handler(module:get_host().."/presence", presence_handler); end - -return _M;
