aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2013-11-06 14:38:51 -0500
committerWaqas Hussain <waqas20@gmail.com>2013-11-06 14:38:51 -0500
commit37895d0d715ca071bc1c79554935074bbec3dd1c (patch)
tree6ba37efe5195a1a26835401fb68df472ec82c72d
parentf725efa472048c323c16dbb544954a94db8b66d2 (diff)
downloadprosody-37895d0d715ca071bc1c79554935074bbec3dd1c.tar.gz
prosody-37895d0d715ca071bc1c79554935074bbec3dd1c.zip
core.moduleapi: Fix some global accesses.
-rw-r--r--core/moduleapi.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/moduleapi.lua b/core/moduleapi.lua
index a32ad245..5a24f69c 100644
--- a/core/moduleapi.lua
+++ b/core/moduleapi.lua
@@ -16,8 +16,10 @@ local timer = require "util.timer";
local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat;
local error, setmetatable, type = error, setmetatable, type;
-local ipairs, pairs, select, unpack = ipairs, pairs, select, unpack;
+local ipairs, pairs, select = ipairs, pairs, select;
local tonumber, tostring = tonumber, tostring;
+local pack = table.pack or function(...) return {n=select("#",...), ...}; end -- table.pack is only in 5.2
+local unpack = table.unpack or unpack; -- renamed in 5.2
local prosody = prosody;
local hosts = prosody.hosts;
@@ -364,7 +366,6 @@ local function timer_callback(now, id, t)
return t.callback(now, unpack(t, 1, t.n));
end
-local pack = table.pack or function(...) return {n=select("#",...), ...}; end
function api:add_timer(delay, callback, ...)
local t = pack(...)
t.module_env = self;