diff options
| author | Kim Alvefur <zash@zash.se> | 2016-02-18 15:00:17 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-02-18 15:00:17 +0100 |
| commit | 90252e8dcc284a3213ae738052c6b6d95628eea7 (patch) | |
| tree | 41f67d3fa5580f3a6b3421303d78a6c68a5e2ff1 /core/modulemanager.lua | |
| parent | f0979385d306fc2c20ba995b29e7b4e0e43f6c15 (diff) | |
| parent | cecd6ca31df847722dc98eb88d374bc58f3020c8 (diff) | |
| download | prosody-90252e8dcc284a3213ae738052c6b6d95628eea7.tar.gz prosody-90252e8dcc284a3213ae738052c6b6d95628eea7.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core/modulemanager.lua')
| -rw-r--r-- | core/modulemanager.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua index 41c9b2fe..65542f9a 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -23,7 +23,8 @@ local setmetatable, rawget = setmetatable, rawget; local ipairs, pairs, type, tostring, t_insert = ipairs, pairs, type, tostring, table.insert; local debug_traceback = debug.traceback; -local unpack, select = unpack, select; +local select = select; +local unpack = table.unpack or unpack; --luacheck: ignore 113 local pcall = function(f, ...) local n = select("#", ...); local params = {...}; |