mirror of
https://github.com/wassname/talk.git
synced 2026-10-29 13:40:57 +08:00
fixed bug
This commit is contained in:
1 parent
15c3a96291
commit
a7c9f01125
1 file changed
+2
-2
@@ -72,9 +72,9 @@ const Asset = {
|
||||
// if we have some.
|
||||
let globalSettings = await Settings.select(...fields);
|
||||
if (settings !== null) {
|
||||
settings = Object.assign({}, globalSettings.toObject(), settings);
|
||||
settings = Object.assign({}, globalSettings, settings);
|
||||
} else {
|
||||
settings = globalSettings.toObject();
|
||||
settings = globalSettings;
|
||||
}
|
||||
|
||||
return settings;
|
||||
|
||||
Reference in new issue
Block a user