From: Kim Alvefur <zash@zash.se>
Date: Sun, 22 May 2016 12:39:20 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=670c0bb01015bf63176eafc5c605c800c7053e1f;hp=ba884557ec95b3720a68b962756e289b82bf15c5;p=prosody.git

Merge 0.10->trunk
---

diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index 5e1eb404..cf762edc 100644
--- 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 dc98bd13..fb9ba3a4 100644
--- 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 843e7dda..6fed1373 100644
--- 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;