# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1264734450 0
# Node ID 9f9d605ef65d41b2e33abfbab08a64920e535f93
# Parent  f28fbc93eb540a5f114c02347ea0646c82147ed9# Parent  37fee489282731e3fc49f12226287150f024b923
Merge backed out changeset

diff -r f28fbc93eb54 -r 9f9d605ef65d plugins/mod_privacy.lua
--- a/plugins/mod_privacy.lua	Fri Jan 29 03:06:37 2010 +0000
+++ b/plugins/mod_privacy.lua	Fri Jan 29 03:07:30 2010 +0000
@@ -415,7 +415,7 @@
 				(stanza.name == "message" and item.message) or
 				(stanza.name == "iq" and item.iq) or
 				(stanza.name == "presence" and jid_bare(stanza.attr.to) == bare_jid and item["presence-in"]) or
-				(stanza.name == "presence" and not stanza.attr.from or jid_bare(stanza.attr.from) == bare_jid and item["presence-out"]) or
+				(stanza.name == "presence" and jid_bare(stanza.attr.from) == bare_jid and item["presence-out"]) or
 				(item.message == false and item.iq == false and item["presence-in"] == false and item["presence-out"] == false)
 			) then
 				apply = true;