Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-10 07:55:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into develop

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-04-05 12:34:38 -04:00
parent 4d9e2b1160 50f4fd5345
commit 0070f5c1b2
890 changed files with 4321 additions and 2113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/install.js
View File

@@ -451,11 +451,11 @@ function enableDefaultPlugins(next) {
if (customDefaults && customDefaults.length) {
try {
customDefaults = JSON.parse(customDefaults);
customDefaults = Array.isArray(customDefaults) ? customDefaults : JSON.parse(customDefaults);
defaultEnabled = defaultEnabled.concat(customDefaults);
} catch (e) {
// Invalid value received
winston.warn('[install/enableDefaultPlugins] Invalid defaultPlugins value received. Ignoring.');
winston.info('[install/enableDefaultPlugins] Invalid defaultPlugins value received. Ignoring.');
}
}