Merge 0.10->trunk

diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index 5e1eb404334f25fed64eec7dbfb12b04d59fcb96..cf762edc880cf6c5cfa8a05fbb8d0015aadf094f 100644 (file)
--- a/plugins/mod_presence.lua
+++ b/plugins/mod_presence.lua
@@ -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

diff --git a/util/datamanager.lua b/util/datamanager.lua
index dc98bd13fd3bfd9a0dd0aa9f347dd181bc81a2c9..fb9ba3a4ce6283f6eb33abce53a218f692cc96c6 100644 (file)
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -17,7 +17,9 @@ local io_open = io.open;
 local os_remove = os.remove;
 local os_rename = os.rename;
 local tonumber = tonumber;
+local tostring = tostring;
 local next = next;
+local type = type;
 local t_insert = table.insert;
 local t_concat = table.concat;
 local envloadfile = require"util.envload".envloadfile;

diff --git a/util/sql.lua b/util/sql.lua
index 843e7ddac74714911e048badf3479e1c7e3f331d..6fed1373ae9f027af12aa6cb92ce901dfcbb674e 100644 (file)
--- a/util/sql.lua
+++ b/util/sql.lua
@@ -2,6 +2,7 @@
 local setmetatable, getmetatable = setmetatable, getmetatable;
 local ipairs, unpack, select = ipairs, table.unpack or unpack, select; --luacheck: ignore 113
 local tonumber, tostring = tonumber, tostring;
+local type = type;
 local assert, pcall, xpcall, debug_traceback = assert, pcall, xpcall, debug.traceback;
 local t_concat = table.concat;
 local s_char = string.char;