mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-06 06:37:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2016-02-18 15:00:17 +01:00
commit 03bec1a290
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/loggingmanager.lua
View file

@ -16,7 +16,8 @@ local math_max, rep = math.max, string.rep;
local os_date = os.date; local os_date = os.date;
local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring; local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
local tostring = tostring; local tostring = tostring;
local select, unpack = select, table.unpack or unpack; local select = select;
local unpack = table.unpack or unpack; --luacheck: ignore 113
local config = require "core.configmanager"; local config = require "core.configmanager";
local logger = require "util.logger"; local logger = require "util.logger";

2
core/moduleapi.lua
View file

@ -23,7 +23,7 @@ local ipairs, pairs, select = ipairs, pairs, select;
local tonumber, tostring = tonumber, tostring; local tonumber, tostring = tonumber, tostring;
local require = require; local require = require;
local pack = table.pack or function(...) return {n=select("#",...), ...}; end -- table.pack is only in 5.2 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 unpack = table.unpack or unpack; --luacheck: ignore 113 -- renamed in 5.2
local prosody = prosody; local prosody = prosody;
local hosts = prosody.hosts; local hosts = prosody.hosts;

3
core/modulemanager.lua
View file

@ -23,7 +23,8 @@ local setmetatable, rawget = setmetatable, rawget;
local ipairs, pairs, type, tostring, t_insert = ipairs, pairs, type, tostring, table.insert; local ipairs, pairs, type, tostring, t_insert = ipairs, pairs, type, tostring, table.insert;
local debug_traceback = debug.traceback; 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 pcall = function(f, ...)
local n = select("#", ...); local n = select("#", ...);
local params = {...}; local params = {...};