From f48536c40dec850b138d4f5089837f964a96090e Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Tue, 22 Jun 2021 08:40:26 -0700 Subject: [PATCH] Fix for #2801. --- db.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db.js b/db.js index 63dd71e6..1a2068bc 100644 --- a/db.js +++ b/db.js @@ -1563,8 +1563,8 @@ module.exports.CreateDB = function (parent, func) { var dbname = 'meshcentral'; if (parent.args.mongodbname) { dbname = parent.args.mongodbname; } - else if (parent.args.mariadb.database) { dbname = parent.args.mariadb.database; } - else if (parent.args.mysql.database) { dbname = parent.args.mysql.database; } + else if ((typeof parent.args.mariadb == 'object') && (typeof parent.args.mariadb.database == 'string')) { dbname = parent.args.mariadb.database; } + else if ((typeof parent.args.mysql == 'object') && (typeof parent.args.mysql.database == 'string')) { dbname = parent.args.mysql.database; } const currentDate = new Date(); const fileSuffix = currentDate.getFullYear() + '-' + padNumber(currentDate.getMonth() + 1, 2) + '-' + padNumber(currentDate.getDate(), 2) + '-' + padNumber(currentDate.getHours(), 2) + '-' + padNumber(currentDate.getMinutes(), 2);