# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1243818362 -3600
# Node ID 7797354dc9b53402f48b7e6464fb45cb82cba8e9
# Parent  497178e0ddbe6138aceba57a7c53af444181dbbd# Parent  0d94c57555d9c81c240311d2cd70ff20f4af41aa
Merge backout with following commits

diff -r 497178e0ddbe -r 7797354dc9b5 core/stanza_router.lua
--- 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