mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-18 03:31:03 +01:00
fix: settings v3
This commit is contained in:
@@ -7,7 +7,7 @@ function expandObjBy(obj1, obj2) {
|
|||||||
let changed = false;
|
let changed = false;
|
||||||
for (const [key, val2] of Object.entries(obj2)) {
|
for (const [key, val2] of Object.entries(obj2)) {
|
||||||
const val1 = obj1[key];
|
const val1 = obj1[key];
|
||||||
const xorIsArray = Array.isArray(val1) === Array.isArray(val2);
|
const xorIsArray = Array.isArray(val1) !== Array.isArray(val2);
|
||||||
if (xorIsArray || !obj1.hasOwnProperty(key) || typeof val2 !== typeof val1) {
|
if (xorIsArray || !obj1.hasOwnProperty(key) || typeof val2 !== typeof val1) {
|
||||||
obj1[key] = val2;
|
obj1[key] = val2;
|
||||||
changed = true;
|
changed = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user