Update access.lua

This commit is contained in:
Alexis Gavoty 2014-04-10 22:12:14 +02:00
parent 8d53f1b366
commit 9bd01e9fb9

View file

@ -19,7 +19,7 @@ local conf = json.decode(conf_file:read("*all"))
local persistent_conf_file = io.open(conf_path..".persistent", "r") local persistent_conf_file = io.open(conf_path..".persistent", "r")
if persistent_conf_file ~= nil then if persistent_conf_file ~= nil then
for k, v in pairs(json.decode(persistent_conf_file:read("*all"))) do for k, v in pairs(json.decode(persistent_conf_file:read("*all"))) do
-- If key already exists and is an table, merge it -- If key already exists and is a table, merge it
if conf[k] and type(v) == "table" then if conf[k] and type(v) == "table" then
for subk, subv in pairs(v) do for subk, subv in pairs(v) do
if type(subk) == "number" then if type(subk) == "number" then