diff options
| author | Kim Alvefur <zash@zash.se> | 2015-04-03 06:39:28 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-04-03 06:39:28 +0200 |
| commit | 609d0795b4737b9bda5f5770507529a7f278808f (patch) | |
| tree | 0ddb52bfa4a521df1e6ef7b9f54e3e3d615597a2 /plugins/mod_presence.lua | |
| parent | 85acc757991e3a425e8d8cab4611c7c321dc8425 (diff) | |
| parent | ea346342bd8e8677c0a5f36828fb2dfa812a0a89 (diff) | |
| download | prosody-609d0795b4737b9bda5f5770507529a7f278808f.tar.gz prosody-609d0795b4737b9bda5f5770507529a7f278808f.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_presence.lua')
| -rw-r--r-- | plugins/mod_presence.lua | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua index 9e8f37db..ab57a158 100644 --- a/plugins/mod_presence.lua +++ b/plugins/mod_presence.lua @@ -106,10 +106,8 @@ function handle_normal_presence(origin, stanza) res.presence.attr.to = nil; end end - if roster.pending then -- resend incoming subscription requests - for jid in pairs(roster.pending) do - origin.send(st.presence({type="subscribe", from=jid})); -- TODO add to attribute? Use original? - end + for jid in pairs(roster[false].pending) do -- resend incoming subscription requests + origin.send(st.presence({type="subscribe", from=jid})); -- TODO add to attribute? Use original? end local request = st.presence({type="subscribe", from=origin.username.."@"..origin.host}); for jid, item in pairs(roster) do -- resend outgoing subscription requests |