diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-06-01 02:06:02 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-06-01 02:06:02 +0100 |
| commit | f6b9a17b954f345038eb6d06d4ac3399f56a3d14 (patch) | |
| tree | 4a0f110fe416ce209a7cdf2661fd9f30acc404e7 | |
| parent | f68d9c8e14dedd4bab4a49b9cc9d818b9cc22c65 (diff) | |
| parent | 9368b3dd1ba0b16961b18f824532be7cee4e410a (diff) | |
| download | prosody-f6b9a17b954f345038eb6d06d4ac3399f56a3d14.tar.gz prosody-f6b9a17b954f345038eb6d06d4ac3399f56a3d14.zip | |
Merge backout with following commits
| -rw-r--r-- | core/stanza_router.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/stanza_router.lua b/core/stanza_router.lua index 58dd820d..7e7e3a43 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 end |