Software / code / prosody
Changeset
2522:9f9d605ef65d
Merge backed out changeset
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 29 Jan 2010 03:07:30 +0000 |
| parents | 2520:f28fbc93eb54 (current diff) 2521:37fee4892827 (diff) |
| children | 2523:0c816b271208 |
| files | plugins/mod_privacy.lua |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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;
