From 9368b3dd1ba0b16961b18f824532be7cee4e410a Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 1 Jun 2009 02:05:27 +0100 Subject: Backed out changeset 98f0e9eadf3b (better fix on the way) --- core/stanza_router.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core') diff --git a/core/stanza_router.lua b/core/stanza_router.lua index 207302c7..4ade0055 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -127,7 +127,7 @@ function core_process_stanza(origin, stanza) else event = "stanza/"..stanza.attr.xmlns..":"..stanza.name; end - if (h.events or prosody.events).fire_event(event, {origin = origin, stanza = stanza}) then return; end + if h.events.fire_event(event, {origin = origin, stanza = stanza}) then return; end end modules_handle_stanza(host or origin.host or origin.to_host, origin, stanza); end @@ -155,7 +155,7 @@ function core_post_stanza(origin, stanza) local event_data = {origin=origin, stanza=stanza}; if origin.full_jid then -- c2s connection - if (hosts[origin.host].events or prosody.events).fire_event('pre-'..stanza.name..to_type, event_data) then return; end -- do preprocessing + if hosts[origin.host].events.fire_event('pre-'..stanza.name..to_type, event_data) then return; end -- do preprocessing end local h = hosts[to_bare] or hosts[host or origin.host]; if h then @@ -163,7 +163,7 @@ function core_post_stanza(origin, stanza) component_handle_stanza(origin, stanza); return; else - if (h.events or prosody.events).fire_event(stanza.name..to_type, event_data) then return; end -- do processing + if h.events.fire_event(stanza.name..to_type, event_data) then return; end -- do processing end else -- non-local recipient core_route_stanza(origin, stanza); -- cgit v1.2.3