# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1249641167 -3600
# Node ID 8ba5752851dca9d7171e94209624ef1152871413
# Parent  726ac98306d840141bc7b65f1e26839a2691457e# Parent  af962e6ae78136d49a2a6d770febc581e3114cac
Merge with 0.5

diff -r 726ac98306d8 -r 8ba5752851dc plugins/mod_presence.lua
--- a/plugins/mod_presence.lua	Wed Aug 05 20:00:07 2009 +0100
+++ b/plugins/mod_presence.lua	Fri Aug 07 11:32:47 2009 +0100
@@ -165,7 +165,7 @@
 
 function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza)
 	local node, host = jid_split(from_bare);
-	if node == origin.username and host == origin.host then return; end -- No self contacts
+	if to_bare == origin.username.."@"..origin.host then return; end -- No self contacts
 	local st_from, st_to = stanza.attr.from, stanza.attr.to;
 	stanza.attr.from, stanza.attr.to = from_bare, to_bare;
 	log("debug", "outbound presence "..stanza.attr.type.." from "..from_bare.." for "..to_bare);