diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-08-24 23:16:08 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-08-24 23:16:08 +0100 |
| commit | 2a7c458b2f21f37a447c7e6dad76c65efc07d4f1 (patch) | |
| tree | 46ee70e977ded44ebeb42ca6007865fd3f5996f3 /plugins | |
| parent | 0c39eb02b91bc1028f523dde1d6b5112cbff8a7f (diff) | |
| parent | 9c72583d71bdb11a6edc42cba583756385eafef3 (diff) | |
| download | prosody-2a7c458b2f21f37a447c7e6dad76c65efc07d4f1.tar.gz prosody-2a7c458b2f21f37a447c7e6dad76c65efc07d4f1.zip | |
Merge 0.9->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_pep.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua index 04f70221..752cd28c 100644 --- a/plugins/mod_pep.lua +++ b/plugins/mod_pep.lua @@ -135,7 +135,7 @@ module:hook("presence/bare", function(event) recipients[user][recipient] = hash; local from_bare = origin.type == "c2s" and origin.username.."@"..origin.host; if self or origin.type ~= "c2s" or (recipients[from_bare] and recipients[from_bare][origin.full_jid]) ~= hash then - -- COMPAT from ~= stanza.attr.to because OneTeam can't deal with missing from attribute + -- COMPAT from ~= stanza.attr.to because OneTeam and Asterisk 1.8 can't deal with missing from attribute origin.send( st.stanza("iq", {from=user, to=stanza.attr.from, id="disco", type="get"}) :query("http://jabber.org/protocol/disco#info") |