Merge 0.10->trunk

[prosody.git] / plugins / mod_presence.lua

diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index 5e1eb404334f25fed64eec7dbfb12b04d59fcb96..e4a317bc1f843ec04aa8c0f3057fd1c72b182f86 100644 (file)
--- a/plugins/mod_presence.lua
+++ b/plugins/mod_presence.lua
@@ -130,7 +130,7 @@ function send_presence_of_available_resources(user, host, jid, recipient_session
        if h and h.type == "local" then
                local u = h.sessions[user];
                if u then
-                       for k, session in pairs(u.sessions) do
+                       for _, session in pairs(u.sessions) do
                                local pres = session.presence;
                                if pres then
                                        if stanza then pres = stanza; pres.attr.from = session.full_jid; end
@@ -178,6 +178,7 @@ function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_
                end
                core_post_stanza(origin, stanza);
                send_presence_of_available_resources(node, host, to_bare, origin);
+               core_post_stanza(origin, st.presence({ type = "probe", from = from_bare, to = to_bare }));
        elseif stanza.attr.type == "unsubscribed" then
                -- 1. send unavailable
                -- 2. route stanza