Make `common.merge` work with invalid arguments

This is needed because users could try to enable plugins with 
`config.plugins.plugin_name = true`.
Before, this would result in `common.merge` throwing an error; now it 
just returns a copy of the "base" table.
This commit is contained in:
Guldoman 2022-06-05 04:10:51 +02:00
parent b70069572e
commit 0b96be7af2
No known key found for this signature in database
GPG Key ID: EA928C8BDA1A8825
1 changed files with 9 additions and 2 deletions

View File

@ -18,9 +18,16 @@ end
function common.merge(a, b) function common.merge(a, b)
a = type(a) == "table" and a or {}
local t = {} local t = {}
for k, v in pairs(a) do t[k] = v end for k, v in pairs(a) do
if b then for k, v in pairs(b) do t[k] = v end end t[k] = v
end
if b and type(b) == "table" then
for k, v in pairs(b) do
t[k] = v
end
end
return t return t
end end