aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-01-29 03:07:30 +0000
committerMatthew Wild <mwild1@gmail.com>2010-01-29 03:07:30 +0000
commit30822c33c06a580a8c2e27f8132a9da8960f5bf3 (patch)
tree85a5ae76f0fa5a745a7826506fd5cfa59c42088d
parent01fd496348b77267d56f72211b430b5516629b32 (diff)
parentee7f33faec6f9785b8ed913efd2fb611158c517e (diff)
downloadprosody-30822c33c06a580a8c2e27f8132a9da8960f5bf3.tar.gz
prosody-30822c33c06a580a8c2e27f8132a9da8960f5bf3.zip
Merge backed out changeset
-rw-r--r--plugins/mod_privacy.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_privacy.lua b/plugins/mod_privacy.lua
index 66ac9f02..006a13d4 100644
--- a/plugins/mod_privacy.lua
+++ b/plugins/mod_privacy.lua
@@ -415,7 +415,7 @@ function checkIfNeedToBeBlocked(e, session)
(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;