Mercurial > lxmppd-hg-xmllex / changeset
changeset
Merge backout with following commits
Mon, 01 Jun 2009 02:06:02 +0100
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Mon, 01 Jun 2009 02:06:02 +0100
- changeset 1263
- 7797354dc9b5
- parent 1261
- 497178e0ddbe (current diff)
- parent 1262
- 0d94c57555d9 (diff)
- child 1264
- 498293bce4bf
Merge backout with following commits
| core/stanza_router.lua | file | annotate | diff | comparison | revisions |
--- a/core/stanza_router.lua Mon Jun 01 01:36:42 2009 +0100 +++ b/core/stanza_router.lua Mon Jun 01 02:06:02 2009 +0100 @@ -127,7 +127,7 @@ 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 @@ 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 @@ 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 end
