aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-02-25 00:08:14 +0000
committerMatthew Wild <mwild1@gmail.com>2011-02-25 00:08:14 +0000
commit4bf7ea696c44e23cf29b825197396f135b83bd8e (patch)
treed37b2ddcf683ef93ed224123615f1391d1f3144b /plugins
parentac95eb9eff94e17627fb173f080a902a94abde30 (diff)
parent1370dd825c4e38407c67636ab6f947a722457444 (diff)
downloadprosody-4bf7ea696c44e23cf29b825197396f135b83bd8e.tar.gz
prosody-4bf7ea696c44e23cf29b825197396f135b83bd8e.zip
Merge 0.8->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_pep.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua
index 9ff6cac2..bd6f4b29 100644
--- a/plugins/mod_pep.lua
+++ b/plugins/mod_pep.lua
@@ -124,7 +124,7 @@ module:hook("presence/bare", function(event)
local recipient = stanza.attr.from;
local current = recipients[user] and recipients[user][recipient];
local hash = get_caps_hash_from_presence(stanza, current);
- if current == hash then return; end
+ if current == hash or (current and current == hash_map[hash]) then return; end
if not hash then
if recipients[user] then recipients[user][recipient] = nil; end
else